Merge branch 'ss/help-htmlpath-config-doc' into maint