Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint