Merge "Fix LegacyProviderMigrationTest" into rvc-dev