DO NOT MERGE [2.2] small writes batch force optimization

I don't get why we need this.