Some fixes in transactions
Fixing a bug in transactions
Merge branch 'master' into dev