Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3