hotfix for FabScanShield v1.1. Merged from developer branch