Merge "Drop less aggressively" into nyc-mr1-dev