Merge branch 'rs/unpack-trees-leakfix' into maint