re #9627 Revert a change to use an interface that failed a unit test
Merge branch 'feature/9627_Doc_Martyn' into develop