Merge branch 'feature/7432_profile_fit2' into develop