PR:           https://github.com/opnsense/core/issues/1004
Sponsored by: OSNet.eu -- https://www.osnet.eu/

(cherry picked from commit 449f506b)
(cherry picked from commit 304e2c3d)