PR: https://forum.opnsense.org/index.php?topic=3514

(cherry picked from commit 48769e27)
(cherry picked from commit 14d53f5b)
(cherry picked from commit 26a66802)