re #8382 reduce cppcheck warnings
Merge branch 'feature/8382_cppcheck_warnings' into develop