Merge "Database transaction flushing cleanups"