Merge remote branch 'origin/bugfix/7799_snap_calibration'
First batch refs #7808
Merge branch 'feature/7808_cppcheck_errors' into develop