Merge remote-tracking branch 'origin/feature/8795_sphinx_task'
Fixed the error reported by cppcheck. Refs #8880.
Merge branch 'feature/8880_fix_cpp' into develop