Merge branch 'cn/cherry-pick-range-docs' into maint