Merge branch 'ss/cherry-pick-x-doc' into maint