Refs #10397 squashing cppcheck warning
Merge branch 'feature/10397_fits_update' into develop