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

(cherry picked from commit 1417414b)
(cherry picked from commit ef1dc387)
(cherry picked from commit ecace09a)