Merge branch 'jl/pack-transfer-avoid-double-close'