Merge "Expose transaction id" into tm-qpr-dev