re #8437 and another warning
Merge branch 'feature/8437_cppcheck_style' into develop