Merge branch 'so/rebase-doc' into maint