Merge "Flip the default on whether to keep rows together" into nyc-dev