Merge branch 'f-use-with_transaction-instead-of-do_transaction'