Merge pull request #2046 from rolfbjarne/profile-simplification