Transactions

Contribution #714061
Contribution #540190