Merge branch 'kb/full-history-compute-treesame-carefully-2'