stash TransactionService changes for rebase