Refs #10061 attempting again to fix build errors
Merge branch 'feature/10061_fits_loader' into develop