Refs #6940 try to remove osx warning
Merge branch 'feature/6940_profile_fit' into develop