Merge branch 'mm/diag-path-in-treeish'