Merge branch 'jk/http-auth-redirects' into maint