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