Merge branch 'mh/maint-http-proxy-fix' into maint