Transactions-update
Merge branch 'Donaldson'