Merge "Avoid writing too much new data per transfer" into nyc-mr1-dev