third batch refs #7808
Merge branch 'feature/7808_cppcheck_errors' into develop