Merge branch 'sb/read-tree' into jch