Merge remote-tracking branch 'origin/roccomoretti/fix_cppcheck_for_188' into benchmark Conflicts: tests/benchmark/tests/build.py