Merge branch 'jk/http-backend-deadlock' into maint