Merge branch 'rs/archive-tree-in-tip-simplify'