Merge branch 'rc/maint-http-fix' into maint