Merge changes from TreeKIT.