Merge branch 'jk/http-leakfixes' into next