fixed the timing of updates
Merge remote-tracking branch 'origin/addressMigrationFullAttempt' into addressMigrationFullAttempt