re #6992 fix attempt for style level, and a bug fix
Merge branch 'feature/6992_cppcheck' into develop