Merge branch 'cb/maint-unpack-trees-absense'