re #8466 cppcheck warnings
Merge branch 'feature/8466_cppcheck_cleanup' into develop