Merge "Create new SM instance when createForAllProfiles" into main