Re #10832. Fixing cppcheck errors.
Merge branch 'feature/10832_cppcheck_doxygen' into develop