Merge "Add filter ordering" into nyc-mr1-dev