Merge "Always trigger a write if no pages are written" into nyc-mr1-dev