Fixes #5291 Fixes #5279
Fixes #5291
Fixes #5279

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