Transactions

Contribution #549781
Contribution #543560