Closed branch WsMigrationRedesign