Merge "Move upgradeUserTypesLU code" into sc-dev