Merge branch 'ew/http-alternates-as-redirects-warning' into maint