Refs #10383 fix for build warning
Merge branch 'feature/10383_fits_workspace' into develop