Merge branch 'ds/merge-base-is-ancestor-optim'