Merge "enum migration" into sc-dev