Merge "Cleanups to DB transaction handling"