Delay updates and deletes to make the process appear more like atomic.

Ticket: #4871