Transactions

Contribution #549887
Contribution #533777