Merge branch 'sb/unpack-trees-grammofix'