Merge branch 'so/rebase-doc-fork-point'