Merge branch 'rs/misc-cppcheck-fixes'