Merge branch 'ds/refmap-doc' into maint