Merge "Disable unused features" into nyc-dev