Migrate users beta, progress9.15 changes on logic fix