Merge "Revert "Resync on the transaction."" into udc-dev