Re #10832. Fixing doxygen warnings.
Re #10832. Fixing cppcheck errors.
Re #10832. Fixing cppcheck errors.
Merge remote-tracking branch 'origin/feature/10832_cppcheck_doxygen'