Merge branch 'jk/http-walker-limit-redirect' into maint