Merge branch 'rs/subtree-fixes'