Merge "Enabling new filtering" into nyc-dev am: 719cb38590
am: bb35e0b049

* commit 'bb35e0b049cdfe350f6a00ffb4e6497fb19abeaa':
  Enabling new filtering