Merge branch 'sc/http-late-auth' into maint