Merge "Enabling new filtering" into nyc-dev