Merge branch 'jc/read-tree-safety'