Transactions

Contribution #629061
Contribution #627593