* Improve metadata flushing efficiency by collapsing operations (fix #2104) * Add changeset * A couple of style tweaks