Remove doxygen warnings

re #7450
Merge branch 'feature/7450_doxy_warns' into develop