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

(cherry picked from commit 85c00a53)
(cherry picked from commit 324bd755)
(cherry picked from commit 0d104a9d)
(cherry picked from commit a7ef4192)
(cherry picked from commit 76068737)