diff --git a/build/sources.props b/build/sources.props
index a08e49dfdb..7f3d24608f 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -7,6 +7,10 @@
       $(DotNetAdditionalRestoreSources);
       $(DotNetRestoreSources);
     </RestoreSources>
+    <RestoreSources Condition="Exists('$(RepositoryRoot)artifacts/build/')">
+      $(RepositoryRoot)artifacts/build/;
+      $(DotNetRestoreSources);
+    </RestoreSources>
     <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
       $(RestoreSources);
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
diff --git a/version.props b/version.props
index 8719aca8f2..96f9bff706 100644
--- a/version.props
+++ b/version.props
@@ -5,7 +5,7 @@
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
     <PreReleaseLabel>rtm</PreReleaseLabel>
     <PreReleaseBrandingLabel></PreReleaseBrandingLabel>
-    <BuildNumber Condition="'$(BuildNumber)' == ''">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>
+    <BuildNumber Condition="'$(BuildNumber)' == '' OR '$(UsingLocalBuildNumber)' == 'true'">$([System.DateTime]::Now.ToString('yyMMdd'))-99</BuildNumber>
     <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
     <ExperimentalVersionPrefix>0.2.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix>
     <VersionSuffix>$(PreReleaseLabel)-$(BuildNumber)</VersionSuffix>