SF_FacilityDisable+Fixes

Blankrequested to merge
Blank/fc-pregmod:SF_FacilityDisable into pregmod-master

closes #503 (closed).

Edited by Blank

Merge request reports