re #8466 cppcheck warnings
re #8466 clear compiler warning
Merge remote-tracking branch 'origin/feature/8466_cppcheck_cleanup'