Migrate users beta, progress9.8 logic fix