Improve performance of folder edit operations.
Autocommit Thu Dec 04 09:42:23 EST 2014