Debugging transactions
Merge remote-tracking branch 'origin/refactor-db' into refactor-db
Merge remote-tracking branch 'origin/refactor-db' into refactor-db