Issue #1604 Atomic updates - order of atomic locks and atomic operations was changed.