re #8466 clear compiler warning
Merge branch 'feature/8466_cppcheck_cleanup' into develop