Merge "Disable single feature test"