Merge branch 'rs/parse-tree-indirect'