diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8e40114d9931..cc1d41b5da4a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,7 +17,7 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>b3f81350c856cfd5079c52349024a8f55d0c009a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="5.0.0-preview.2.20152.11">
+    <Dependency Name="Microsoft.NET.HostModel" Version="5.0.0-preview.3.20161.13">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>b3f81350c856cfd5079c52349024a8f55d0c009a</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
index 43d5b8c45ac5..72524a80b1ea 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -33,7 +33,7 @@
     <MicrosoftDotNetPlatformAbstractionsPackageVersion>5.0.0-preview.2.20152.11</MicrosoftDotNetPlatformAbstractionsPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.2-runtime.20152.11</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-preview.2.20152.11</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>5.0.0-preview.2.20152.11</MicrosoftNETHostModelVersion>
+    <MicrosoftNETHostModelVersion>5.0.0-preview.3.20161.13</MicrosoftNETHostModelVersion>
     <PlatformAbstractionsVersion>$(MicrosoftDotNetPlatformAbstractionsPackageVersion)</PlatformAbstractionsVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
   </PropertyGroup>
diff --git a/src/Cli/dotnet/ShellShim/AppHostShimMaker.cs b/src/Cli/dotnet/ShellShim/AppHostShimMaker.cs
index 03a24b9e04ae..d30e7562ebae 100644
--- a/src/Cli/dotnet/ShellShim/AppHostShimMaker.cs
+++ b/src/Cli/dotnet/ShellShim/AppHostShimMaker.cs
@@ -48,7 +48,7 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
 
             if (ResourceUpdater.IsSupportedOS())
             {
-                var windowsGraphicalUserInterfaceBit = BinaryUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
+                var windowsGraphicalUserInterfaceBit = PEUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
                 HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
                                          appHostDestinationFilePath: appHostDestinationFilePath,
                                          appBinaryFilePath: appBinaryFilePath,
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
index 2a1cd546e953..8d7bb98d39b6 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
@@ -23,7 +23,8 @@ public class GenerateBundle : TaskBase
 
         protected override void ExecuteCore()
         {
-            var bundler = new Bundler(AppHostName, OutputDir, IncludeSymbols, ShowDiagnosticOutput);
+            BundleOptions options = BundleOptions.BundleAllContent | (IncludeSymbols ? BundleOptions.BundleSymbolFiles : BundleOptions.None);
+            var bundler = new Bundler(AppHostName, OutputDir, options, diagnosticOutput: ShowDiagnosticOutput);
             var fileSpec = new List<FileSpec>(FilesToBundle.Length);
 
             foreach (var item in FilesToBundle)
diff --git a/src/Tests/Microsoft.DotNet.ShellShim.Tests/AppHostShellShimMakerTests.cs b/src/Tests/Microsoft.DotNet.ShellShim.Tests/AppHostShellShimMakerTests.cs
index f0c4e5dbf2f7..798a14dfb6ed 100644
--- a/src/Tests/Microsoft.DotNet.ShellShim.Tests/AppHostShellShimMakerTests.cs
+++ b/src/Tests/Microsoft.DotNet.ShellShim.Tests/AppHostShellShimMakerTests.cs
@@ -25,7 +25,7 @@ public void WhenCallWithWpfDllItCanCreateShimWithWindowsGraphicalUserInterfaceBi
         {
             string shimPath = CreateApphostAndReturnShimPath();
 
-            BinaryUtils.GetWindowsGraphicalUserInterfaceBit(shimPath).Should().Be(WindowsGUISubsystem);
+            PEUtils.GetWindowsGraphicalUserInterfaceBit(shimPath).Should().Be(WindowsGUISubsystem);
         }
 
         [UnixOnlyFact]
diff --git a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs
index 80e56aca08ff..dc957b129ca2 100644
--- a/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs
+++ b/src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs
@@ -433,7 +433,7 @@ public void Given_wpf_project_It_contains_shim_with_WindowsGraphicalUserInterfac
                     $"tools/netcoreapp3.0/any/shims/win-x64/{_customToolCommandName}.exe",
                     tmpfilePath,
                     null);
-                HostModel.AppHost.BinaryUtils.GetWindowsGraphicalUserInterfaceBit(copiedFile).Should().Be(windowsGUISubsystem);
+                HostModel.AppHost.PEUtils.GetWindowsGraphicalUserInterfaceBit(copiedFile).Should().Be(windowsGUISubsystem);
             }
         }