re #8418 cppcheck style
Merge branch 'feature/8418_cppcheck_performance' into develop