Merge "Polish work for work profile" into sc-dev