Merge branch 'rs/match-trees-refactor'