Merge "Revert "Revert "Using Transaction directly instead of building s..."" into tm-qpr-dev