PR: https://github.com/opnsense/core/issues/1214

(cherry picked from commit 5dc95bac)
(cherry picked from commit 6eea44ff)