re #9671 resolve warning
Merge branch 'feature/9671_TEST_Facility' into develop