Merge branch 'database-transactions'