Merge branch 'mh/maint-config-doc-proxy-command'