Merge "Migrate features-test"