Merge branch 'jk/free-tree-buffer'