Re #6972. Clearing out doxygen warnings.
Merge branch 'feature/6972_offlinehelp_integration' into develop