PR: https://github.com/opnsense/core/issues/1709
PR: https://github.com/opnsense/core/issues/1710

(cherry picked from commit 093895e3)
(cherry picked from commit cebc6c7e)
(cherry picked from commit e5e914c9)
(cherry picked from commit 4ff07cad)
(cherry picked from commit 576799a1)
(cherry picked from commit 8236ddcc)
(cherry picked from commit 5525a08a)
(cherry picked from commit 46c460bb)