Merge "Track transaction merges through transaction trace" into udc-dev