Merge "Fix subplan filtering" into nyc-mr1-dev