Transactions

Contribution #534751
Contribution #507735