Transactions

Contribution #16467
Contribution #16467