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

(cherry picked from commit fb7c4617)
(cherry picked from commit 2acd4595)
(cherry picked from commit 6e57f407)