Merge branch 'jk/http-walker-buffer-underflow-fix'