DC21-564: Update migration and external id setups