Merge "Update migrateUserGroup to deal with primary key issue"