re #9671 re-enable disabled tests
Merge branch 'feature/9671_TEST_Facility' into develop