Merge branch 'ct/diff-with-merge-base-clarification' into master