Merge branch 'sr/http-proxy-configuration-fix'