Merge "consolidate profiles and profile-cache"