Merge "feat(HCT): Perform custom migration logic for existing HCT users" into main