Merge "Handle general and specific cross profile logic" into sc-dev