Merge branch 'jc/http-clear-finished-pointer'