Merge branch 'jc/read-tree-safety' into next