Re #10832. Fixing doxygen warnings.
Merge branch 'feature/10832_cppcheck_doxygen' into develop