Merge branch 'ah/unpack-trees-advice-messages'