Merge branch 'cb/leading-path-removal' into next