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

(cherry picked from commit 9a0c3839)
(cherry picked from commit edc40978)
(cherry picked from commit 4283c02a)
(cherry picked from commit 850cd7a5)
(cherry picked from commit 8d11de1b)