re #8382 remove warning
Merge branch 'feature/8382_cppcheck_warnings' into develop