Merge "Don't apply transactions of abort out-of-order." into udc-dev