Merge pull request #2816 from xmcclure/profile-clean-0