Merge branch 'rc/maint-http-local-slot-fix'