Merge branch 'rs/simplify-http-walker'