Refs #10397 attempting to fix osx build
Merge branch 'feature/10397_fits_update' into develop