Merge branch 't/buffer_tree_improvements'