Merge branch 'rc/maint-http-wrong-free'