Refs #7432 fix Mac builds
Merge branch 'feature/7432_profile_fit2' into develop