Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint