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

(cherry picked from commit 87dfc1f1)
(cherry picked from commit 76a2a1f3)
(cherry picked from commit e29f1b40)