Merge branch 'jc/merge-base-fork-point-doc' into maint