Finish merge started in 023e2d3 (new way to use download storage methods, "start-transaction-if-not-started-yet" behavior in PostgreSQL download storage method)