PR: https://github.com/opnsense/core/issues/1189 (cherry picked from commit 0fb1cb1d) (cherry picked from commit e52b51f5) (cherry picked from commit 98ed70d8) (cherry picked from commit 0760c967)