PR: https://github.com/opnsense/core/pull/1328/

(cherry picked from commit 2dac5fd2)
(cherry picked from commit 6b14bb27)
(cherry picked from commit b376646f)