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

(cherry picked from commit 844d6b50)
(cherry picked from commit b8c9eb47)
(cherry picked from commit 2d03d196)