diff --git a/build/buildorder.props b/build/buildorder.props
index 54603518d7..50e58fc161 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -24,11 +24,11 @@
     <RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
     <RepositoryBuildOrder Include="Antiforgery" Order="10" />
     <RepositoryBuildOrder Include="IISIntegration" Order="10" />
-    <RepositoryBuildOrder Include="CORS" Order="11" />
     <RepositoryBuildOrder Include="StaticFiles" Order="11" />
     <RepositoryBuildOrder Include="ResponseCaching" Order="11" />
     <RepositoryBuildOrder Include="Session" Order="11" />
     <RepositoryBuildOrder Include="ServerTests" Order="11" />
+    <RepositoryBuildOrder Include="CORS" Order="12" />
     <RepositoryBuildOrder Include="Routing" Order="12" />
     <RepositoryBuildOrder Include="Diagnostics" Order="12" />
     <RepositoryBuildOrder Include="Localization" Order="13" />
diff --git a/modules/Mvc b/modules/Mvc
index 18acae77c8..d3c8d171bd 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit 18acae77c8e125ee192c68442a80b28e3fa77df5
+Subproject commit d3c8d171bd51897f14356016b48b9d8bf29dd4a2