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

* commit '719cb385908b9f9936b26b0893fad181150cf0d8':
  Enabling new filtering