re #9627 resolve comment warnings
Merge branch 'feature/9627_Doc_Martyn' into develop