Merge "Improve work profile unification flow" into rvc-dev