DO NOT MERGE [2.2] small writes batch force optimization

Unused import?