re #6992 fix attempt for performance level error batch 3
Merge branch 'feature/6992_cppcheck' into develop