Bug 23794: (RM follow-up) Make DB update consistent