Refs #6940 fix warnings
Merge branch 'feature/6940_profile_fit' into develop