#1563058 fix slow saving on larger batches of changes