Issue #22824:wrap db updates in transaction