Transactions

Contribution #804863
Contribution #632024