Merge branch 'cb/doc-fetch-pull-merge' into maint