Fixed #5561 (mostly)
Fixed #5561 (mostly)

phil-davis/pfsense,BlackstarGroup/pfsense,jxmx/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,NOYB/pfsense,brunostein/pfsense,BlackstarGroup/pfsense,jxmx/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,pfsense/pfsense,NewEraCracker/pfsense,dennypage/pfsense,pfsense/pfsense,NOYB/pfsense,phil-davis/pfsense,jxmx/pfsense,brunostein/pfsense,ch1c4um/pfsense,ptorsten/pfsense,NewEraCracker/pfsense,pfsense/pfsense,dennypage/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,NewEraCracker/pfsense,brunostein/pfsense,NOYB/pfsense,ptorsten/pfsense,ch1c4um/pfsense,dennypage/pfsense,pfsense/pfsense,ptorsten/pfsense,dennypage/pfsense