Merge branch 'ms/http-auth' into next