Merge "Refactor TransactionProxy"