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