re #9671 resolve mac catastrophic error - very dramatic
Merge branch 'feature/9671_TEST_Facility' into develop