PR: https://github.com/opnsense/core/issues/1455

(cherry picked from commit f6d83a94)
(cherry picked from commit 1dabd53d)
(cherry picked from commit 73b1d444)