Re #8382. Move suppression to the right place.
Merge branch 'feature/8382_cppcheck_warnings' into develop