Merge branch 'po/range-doc' into maint