Transactions

Contribution #588431
Contribution #577462