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

(cherry picked from commit ed66e872)
(cherry picked from commit 93d68f77)