Merge branch 'jk/http-backend-deadlock'