diff --git a/.gitignore b/.gitignore
index 7d710e83e..1bebec4e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .idea
+.config/
+.nuget\\packages\\/
 CMakeCache.txt
 CMakeFiles/
 Makefile
@@ -6,3 +8,4 @@ Makefile
 cmake_install.cmake
 externals
 scripts/xunittests.xml
+/scripts/powershell.inc
diff --git a/scripts/Makefile b/scripts/Makefile
index 30125c6bb..5a07abe9d 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -92,10 +92,21 @@ MPATH=/usr/lib/mono/4.5/Facades
 buildtemp/TypeCatalogGen.exe: ../src/monad/monad/nttargets/assemblies/core/PSAssemblyLoadContext/TypeCatalogGen/TypeCatalogGen.cs buildtemp/System.Reflection.Metadata.dll buildtemp/System.Collections.Immutable.dll
 	$(MCS) -out:$@ -target:exe $(NUGETREF) -pkg:dotnet -r:$(MPATH)/System.Runtime.dll -r:$(MPATH)/System.Reflection.Primitives.dll -r:$(MPATH)/System.IO.dll $<
 
+# this generates the necessary file of CoreCLR references that is an artifact of the Windows build process
+# since we don't have Make 4.1, we can't use $(file), and using @echo makes the escaping tricky
+# the list of references MUST be line-by-line, to match '^\$\(PS_PROFILE_REF_PATH\)\\(.+);\s*\\$'
+REFERENCE_ASSEMBLIES=$(notdir $(shell ls $(TARGETING_PACK)/*.dll))
+PROFILE_REFERENCES=$(addsuffix ;\\\n, $(addprefix $$(PS_PROFILE_REF_PATH)\, $(REFERENCE_ASSEMBLIES)))
+powershell.inc:
+	@echo 'PROFILE_REF_PATH=$$(SDK_REF_PATH)\Profiles' > $@
+	@echo 'PS_PROFILE_REF_PATH=$$(PROFILE_REF_PATH)\PowerShell' >> $@
+	@echo 'PROFILE_REFERENCES=\\' >> $@
+	@echo '$(PROFILE_REFERENCES)' >> $@
+
 # generate the Core PS type catalog
 # this comes from: ../src/monad/monad/nttargets/assemblies/core/PSAssemblyLoadContext/makefile.inc
-CorePsTypeCatalog.cs: powershell-linux.inc buildtemp/TypeCatalogGen.exe buildtemp/System.Reflection.Metadata.dll buildtemp/System.Collections.Immutable.dll
-	LD_LIBRARY_PATH=. mono buildtemp/TypeCatalogGen.exe powershell-linux.inc $@ $(MONAD_EXT)/coreclr/TargetingPack
+CorePsTypeCatalog.cs: powershell.inc buildtemp/TypeCatalogGen.exe buildtemp/System.Reflection.Metadata.dll buildtemp/System.Collections.Immutable.dll
+	LD_LIBRARY_PATH=. mono buildtemp/TypeCatalogGen.exe $< $@ $(MONAD_EXT)/coreclr/TargetingPack
 
 # the pinvoke library libps.so
 
@@ -221,7 +232,7 @@ clean:
 	rm -rf exec_env
 	rm -rf buildtemp/libps-build
 	rm -rf dotnetlibs/*
-	rm -f xunittests.xml
+	rm -f xunittests.xml powershell.inc
 
 # clean built stuff + prepare step
 cleanall: clean
diff --git a/scripts/build-run.sh b/scripts/build-run.sh
new file mode 100755
index 000000000..625dc12c3
--- /dev/null
+++ b/scripts/build-run.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+
+CUID=$(id -u)
+CUSER=$(id -un)
+CGID=$(id -g)
+CGROUP=$(id -gn)
+DIR=/opt/monad-linux
+VOLUME=$(dirname $(pwd))/:$DIR
+
+# creates new user in container matching the local user so that
+# artifacts will be owned by the local user; set IMPERSONATE to false
+# to disable and run as root, defaults to true
+if [[ ! $IMPERSONATE ]]; then IMPERSONATE=true; fi
+impersonate()
+{
+    if ! $IMPERSONATE; then return; fi
+    echo \
+	groupadd -g $CGID $CGROUP '&&' \
+	useradd -u $CUID -g $CGID -d $DIR $CUSER '&&' \
+	sudo --set-home -u $CUSER -g $CGROUP
+}
+
+docker run --rm \
+       --volume $VOLUME \
+       --workdir $DIR/scripts \
+       $DOCKERFLAGS \
+       andschwa/magrathea:latest \
+       bash -c "$(impersonate) $*"
diff --git a/scripts/build-tty.sh b/scripts/build-tty.sh
new file mode 100755
index 000000000..d6dfcbea6
--- /dev/null
+++ b/scripts/build-tty.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+# Runs with a pseudo tty so that interactive shells can be opened
+export DOCKERFLAGS="--interactive --tty"
+./build-run.sh "$*"
diff --git a/scripts/build.sh b/scripts/build.sh
index 72b1f2272..abf252cc2 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,9 +1,5 @@
 #!/usr/bin/env sh
 
-# Docker requires the volume path to be absolute... so we resolve it ourselves.
-docker run --rm --interactive --tty \
-       --volume $(dirname $(pwd))/:/opt/monad \
-       --workdir /opt/monad/scripts \
-       andschwa/magrathea:latest \
-       bash -c "/opt/fakelogin; $*"
-# we use $* over $@ so that multi-word parameters aren't split up
+# Runs by non-interactively, just attaches output
+export DOCKERFLAGS="--attach STDOUT --attach STDERR"
+./build-run.sh "$*"
diff --git a/scripts/commands-utility.mk b/scripts/commands-utility.mk
index 9b0ffc20f..1ddd09eeb 100644
--- a/scripts/commands-utility.mk
+++ b/scripts/commands-utility.mk
@@ -54,6 +54,7 @@ COMMANDS_UTILITY_SRCS_WIN=\
 	../../../jws/pswin/admin/monad/src/commands/utility/WriteProgressCmdlet.cs	\
 	../../../jws/pswin/admin/monad/src/commands/utility/Update-Data.cs	\
 	../../../jws/pswin/admin/monad/src/commands/utility/Update-TypeData.cs	\
+	../../../jws/pswin/admin/monad/src/commands/utility/AddAssembly.cs	\
 	../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs	\
 	../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs	\
 	../../../jws/pswin/admin/monad/src/commands/utility/FormatAndOutput/format-list/Format-List.cs	\
@@ -126,6 +127,7 @@ COMMANDS_UTILITY_SRCS=\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/WriteProgressCmdlet.cs	\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/Update-Data.cs	\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/Update-TypeData.cs	\
+	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/AddAssembly.cs	\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs	\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs	\
 	$(ADMIN_GIT_ROOT)/monad/src/commands/utility/FormatAndOutput/format-list/Format-List.cs	\
@@ -171,6 +173,7 @@ COMMANDS_UTILITY_RESX_SRCS=\
 	../../../jws/pswin/admin/monad/src/commands/utility/resources/UpdateDataStrings.resx	\
 	../../../jws/pswin/admin/monad/src/commands/utility/resources/ImportLocalizedDataStrings.resx	\
 	../../../jws/pswin/admin/monad/src/commands/utility/resources/WriteProgressResourceStrings.resx	\
+	../../../jws/pswin/admin/monad/src/commands/utility/resources/AddAssemblyStrings.resx	\
 	../../../jws/pswin/admin/monad/src/commands/utility/resources/AliasCommandStrings.resx	\
 
 
@@ -195,6 +198,7 @@ COMMANDS_UTILITY_RES_SRCS=\
 	gen/COMMANDS_UTILITY/UpdateDataStrings.resources	\
 	gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.resources	\
 	gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources	\
+	gen/COMMANDS_UTILITY/AddAssemblyStrings.resources	\
 	gen/COMMANDS_UTILITY/AliasCommandStrings.resources	\
 
 
@@ -219,6 +223,7 @@ COMMANDS_UTILITY_RES_CS_SRCS=\
 	gen/COMMANDS_UTILITY/UpdateDataStrings.cs	\
 	gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.cs	\
 	gen/COMMANDS_UTILITY/WriteProgressResourceStrings.cs	\
+	gen/COMMANDS_UTILITY/AddAssemblyStrings.cs	\
 	gen/COMMANDS_UTILITY/AliasCommandStrings.cs	\
 
 
@@ -243,6 +248,7 @@ COMMANDS_UTILITY_RES_REF=\
 	-resource:gen/COMMANDS_UTILITY/UpdateDataStrings.resources	\
 	-resource:gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.resources	\
 	-resource:gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources	\
+	-resource:gen/COMMANDS_UTILITY/AddAssemblyStrings.resources	\
 	-resource:gen/COMMANDS_UTILITY/AliasCommandStrings.resources	\
 
 
diff --git a/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.cs b/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.cs
new file mode 100755
index 000000000..22b8cb136
--- /dev/null
+++ b/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.cs
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.34209
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+
+
+/// <summary>
+///   A strongly-typed resource class, for looking up localized strings, etc.
+/// </summary>
+// This class was auto-generated by the StronglyTypedResourceBuilder
+// class via a tool like ResGen or Visual Studio.
+// To add or remove a member, edit your .ResX file then rerun ResGen
+// with the /str option, or rebuild your VS project.
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+internal class AddAssemblyStrings {
+    
+    private static global::System.Resources.ResourceManager resourceMan;
+    
+    private static global::System.Globalization.CultureInfo resourceCulture;
+    
+    [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    internal AddAssemblyStrings() {
+    }
+    
+    /// <summary>
+    ///   Returns the cached ResourceManager instance used by this class.
+    /// </summary>
+    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+    internal static global::System.Resources.ResourceManager ResourceManager {
+        get {
+            if (object.ReferenceEquals(resourceMan, null)) {
+                global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AddAssemblyStrings", typeof(AddAssemblyStrings).GetTypeInfo().Assembly);
+                resourceMan = temp;
+            }
+            return resourceMan;
+        }
+    }
+    
+    /// <summary>
+    ///   Overrides the current thread's CurrentUICulture property for all
+    ///   resource lookups using this strongly typed resource class.
+    /// </summary>
+    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+    internal static global::System.Globalization.CultureInfo Culture {
+        get {
+            return resourceCulture;
+        }
+        set {
+            resourceCulture = value;
+        }
+    }
+    
+    /// <summary>
+    ///   Looks up a localized string similar to Cannot load the assembly because path &apos;{0}&apos; referred to a &apos;{1}&apos; provider path. Change the path to a file system path..
+    /// </summary>
+    internal static string SupportFileSystemOnly {
+        get {
+            return ResourceManager.GetString("SupportFileSystemOnly", resourceCulture);
+        }
+    }
+}
diff --git a/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.resources b/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.resources
new file mode 100755
index 000000000..7716dbae2
Binary files /dev/null and b/scripts/gen/COMMANDS_UTILITY/AddAssemblyStrings.resources differ
diff --git a/scripts/gen/SYS_AUTO/FileSystemProviderStrings.cs b/scripts/gen/SYS_AUTO/FileSystemProviderStrings.cs
index 4572fb948..0fc7314b6 100644
--- a/scripts/gen/SYS_AUTO/FileSystemProviderStrings.cs
+++ b/scripts/gen/SYS_AUTO/FileSystemProviderStrings.cs
@@ -196,6 +196,15 @@ internal class FileSystemProviderStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Destination folder &apos;{0}&apos; does not exist..
+    /// </summary>
+    internal static string CopyItemDirectoryNotFound {
+        get {
+            return ResourceManager.GetString("CopyItemDirectoryNotFound", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Destination path {0} is a file that already exists on the target destination..
     /// </summary>
@@ -206,7 +215,7 @@ internal class FileSystemProviderStrings {
     }
     
     /// <summary>
-    ///   Looks up a localized string similar to Cannot copy a directory &apos;{0}&apos; to file {0}&apos;.
+    ///   Looks up a localized string similar to Cannot copy a directory &apos;{0}&apos; to file &apos;{0}&apos;.
     /// </summary>
     internal static string CopyItemRemotelyDestinationIsFile {
         get {
diff --git a/scripts/gen/SYS_AUTO/FileSystemProviderStrings.resources b/scripts/gen/SYS_AUTO/FileSystemProviderStrings.resources
index 4c9458ea8..0a31ab34a 100644
Binary files a/scripts/gen/SYS_AUTO/FileSystemProviderStrings.resources and b/scripts/gen/SYS_AUTO/FileSystemProviderStrings.resources differ
diff --git a/scripts/gen/SYS_AUTO/Modules.cs b/scripts/gen/SYS_AUTO/Modules.cs
index 1698dd5e6..89a618ff2 100644
--- a/scripts/gen/SYS_AUTO/Modules.cs
+++ b/scripts/gen/SYS_AUTO/Modules.cs
@@ -764,6 +764,15 @@ internal class Modules {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The module to process &apos;{0}&apos;, listed in field &apos;{1}&apos; of module manifest &apos;{2}&apos; was not processed. {3}.
+    /// </summary>
+    internal static string ManifestMemberNotValid {
+        get {
+            return ResourceManager.GetString("ManifestMemberNotValid", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to The specified MaximumVersion &apos;{0}&apos; was incorrect. If you are using &apos;*&apos;, MaximumVersion only supports one &apos;*&apos; and should always be placed at the end of MaximumVersion..
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/Modules.resources b/scripts/gen/SYS_AUTO/Modules.resources
index e21385a99..496f83d23 100644
Binary files a/scripts/gen/SYS_AUTO/Modules.resources and b/scripts/gen/SYS_AUTO/Modules.resources differ
diff --git a/scripts/gen/SYS_AUTO/ParserStrings.cs b/scripts/gen/SYS_AUTO/ParserStrings.cs
index 82d51f4f3..4873d9a3b 100644
--- a/scripts/gen/SYS_AUTO/ParserStrings.cs
+++ b/scripts/gen/SYS_AUTO/ParserStrings.cs
@@ -342,6 +342,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Cannot create type. Only core types are supported in this language mode..
+    /// </summary>
+    internal static string CannotCreateTypeConstrainedLanguage {
+        get {
+            return ResourceManager.GetString("CannotCreateTypeConstrainedLanguage", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Cannot find an appropriate constructor to instantiate the custom attribute object for type &apos;{0}&apos;..
     /// </summary>
@@ -676,6 +685,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to PartialConfiguration &apos;{0}&apos; has a Refresh Mode set to Disabled which is not a valid mode for Partial Configurations. Use Pull or Push refresh mode. .
+    /// </summary>
+    internal static string DisabledRefreshModeNotValidForPartialConfig {
+        get {
+            return ResourceManager.GetString("DisabledRefreshModeNotValidForPartialConfig", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Cannot find an overload for &quot;{0}&quot; and the argument count: &quot;{1}&quot;.
     /// </summary>
@@ -1289,6 +1307,15 @@ internal class ParserStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to The PartialConfiguration &apos;{0}&apos; is set to pull mode which requires a ConfigurationSource property..
+    /// </summary>
+    internal static string GetPullModeNeedConfigurationSource {
+        get {
+            return ResourceManager.GetString("GetPullModeNeedConfigurationSource", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to There is no Runspace available to get and run the SteppablePipeline in this thread. You can provide one in the DefaultRunspace property of the System.Management.Automation.Runspaces.Runspace type. The script block you attempted to get SteppablePipeline from was: {0}.
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/ParserStrings.resources b/scripts/gen/SYS_AUTO/ParserStrings.resources
index c84df64b1..116a84359 100644
Binary files a/scripts/gen/SYS_AUTO/ParserStrings.resources and b/scripts/gen/SYS_AUTO/ParserStrings.resources differ
diff --git a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
index 1bb3258f9..381664387 100644
--- a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
+++ b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.cs
@@ -1001,15 +1001,6 @@ internal class RemotingErrorIdStrings {
         }
     }
     
-    /// <summary>
-    ///   Looks up a localized string similar to Role Capabilities to apply to this session configuration. This role capability must be defined as a PowerShell Role Capability (.psrc) file named after that role capability within a &apos;RoleCapabilities&apos; directory in a module in the current module path..
-    /// </summary>
-    internal static string DISCRoleCapabilitiesToLoadComment {
-        get {
-            return ResourceManager.GetString("DISCRoleCapabilitiesToLoadComment", resourceCulture);
-        }
-    }
-    
     /// <summary>
     ///   Looks up a localized string similar to User roles (security groups), and the role capabilities that should be applied to them when applied to a session.
     /// </summary>
@@ -1028,6 +1019,15 @@ internal class RemotingErrorIdStrings {
         }
     }
     
+    /// <summary>
+    ///   Looks up a localized string similar to Groups associated with machine&apos;s (virtual) administrator account.
+    /// </summary>
+    internal static string DISCRunAsVirtualAccountGroupsComment {
+        get {
+            return ResourceManager.GetString("DISCRunAsVirtualAccountGroupsComment", resourceCulture);
+        }
+    }
+    
     /// <summary>
     ///   Looks up a localized string similar to Version number of the schema used for this document.
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources
index de3571e7f..bff6014c3 100644
Binary files a/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources and b/scripts/gen/SYS_AUTO/RemotingErrorIdStrings.resources differ
diff --git a/scripts/gen/SYS_AUTO/SessionStateStrings.cs b/scripts/gen/SYS_AUTO/SessionStateStrings.cs
index effe05b52..19d2bbafa 100644
--- a/scripts/gen/SYS_AUTO/SessionStateStrings.cs
+++ b/scripts/gen/SYS_AUTO/SessionStateStrings.cs
@@ -376,15 +376,6 @@ internal class SessionStateStrings {
         }
     }
     
-    /// <summary>
-    ///   Looks up a localized string similar to The remote path &apos;{0}&apos; is not valid..
-    /// </summary>
-    internal static string CopyItemRemotelyPathIsNotValid {
-        get {
-            return ResourceManager.GetString("CopyItemRemotelyPathIsNotValid", resourceCulture);
-        }
-    }
-    
     /// <summary>
     ///   Looks up a localized string similar to &apos;{0}&apos; parameter cannot be null or empty..
     /// </summary>
diff --git a/scripts/gen/SYS_AUTO/SessionStateStrings.resources b/scripts/gen/SYS_AUTO/SessionStateStrings.resources
index 3ae06c1d4..eb1db39f5 100644
Binary files a/scripts/gen/SYS_AUTO/SessionStateStrings.resources and b/scripts/gen/SYS_AUTO/SessionStateStrings.resources differ
diff --git a/scripts/powershell-linux.inc b/scripts/powershell-linux.inc
deleted file mode 100644
index 49f140467..000000000
--- a/scripts/powershell-linux.inc
+++ /dev/null
@@ -1,136 +0,0 @@
-#
-# This file includes OneCore powershell CoreCLR references. Do not import this file directly. It is automatically imported
-# when MANAGED_PROFILE=PowerShell is specified in sources file.
-#
-# This file is also depended on by the tool 'TypeCatalogGen.exe'. The tool tries to parse this file to get the list of reference 
-# assemblies used by OneCore powershell, and then use that list to generate the CSharp code for initializing the CoreCLR type
-# catalog cache. That CSharp code will be compiled into 'Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.dll' during the build.
-# For more information about 'TypeCatalogGen.exe', see its source code under 'PSAssemblyLoadContext\TypeCatalogGen'.
-#
-# The parsing rule of this file in 'TypeCatalogGen.exe' is very simple:
-#   - Read each line of this file and trim it;
-#   - Skip comment lines;
-#   - Match the line with the regular expression pattern '^\$\(PS_PROFILE_REF_PATH\)\\(.+);\s*\\$'
-# So when adding new reference assembly entries, please make sure the new lines match the above pattern.
-#
-PROFILE_REF_PATH=$(SDK_REF_PATH)\Profiles
-PS_PROFILE_REF_PATH=$(PROFILE_REF_PATH)\PowerShell
-
-PROFILE_REFERENCES=\
-	$(PS_PROFILE_REF_PATH)\Microsoft.CSharp.dll;\
-	$(PS_PROFILE_REF_PATH)\Microsoft.VisualBasic.dll;\
-	$(PS_PROFILE_REF_PATH)\Microsoft.Win32.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\Microsoft.Win32.Registry.AccessControl.dll;\
-	$(PS_PROFILE_REF_PATH)\Microsoft.Win32.Registry.dll;\
-	$(PS_PROFILE_REF_PATH)\System.AppContext.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Collections.Concurrent.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Collections.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Collections.NonGeneric.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Collections.Specialized.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ComponentModel.Annotations.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ComponentModel.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ComponentModel.EventBasedAsync.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ComponentModel.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ComponentModel.TypeConverter.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Console.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Data.Common.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Data.SqlClient.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.Contracts.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.Debug.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.FileVersionInfo.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.Process.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.TextWriterTraceListener.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.Tools.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.TraceSource.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Diagnostics.Tracing.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Dynamic.Runtime.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Globalization.Calendars.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Globalization.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Globalization.Extensions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.Compression.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.Compression.ZipFile.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.FileSystem.AccessControl.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.FileSystem.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.FileSystem.DriveInfo.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.FileSystem.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.FileSystem.Watcher.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.MemoryMappedFiles.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.Pipes.dll;\
-	$(PS_PROFILE_REF_PATH)\System.IO.UnmanagedMemoryStream.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Linq.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Linq.Expressions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Linq.Parallel.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Linq.Queryable.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Http.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Http.WinHttpHandler.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.NameResolution.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.NetworkInformation.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Security.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Sockets.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.Utilities.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.WebHeaderCollection.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.WebSockets.Client.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Net.WebSockets.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ObjectModel.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.DispatchProxy.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.Emit.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.Emit.ILGeneration.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.Emit.Lightweight.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.Extensions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Reflection.TypeExtensions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Resources.ReaderWriter.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Resources.ResourceManager.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.CompilerServices.VisualC.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Extensions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Handles.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.InteropServices.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.InteropServices.WindowsRuntime.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Loader.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Numerics.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Serialization.Json.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Serialization.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Runtime.Serialization.Xml.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.AccessControl.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Claims.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.DeriveBytes.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Encoding.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Encryption.Aes.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Encryption.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Hashing.Algorithms.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Hashing.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.RandomNumberGenerator.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.RSA.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Cryptography.X509Certificates.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Principal.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.Principal.Windows.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Security.SecureString.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceModel.Duplex.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceModel.Http.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceModel.NetTcp.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceModel.Primitives.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceModel.Security.dll;\
-	$(PS_PROFILE_REF_PATH)\System.ServiceProcess.ServiceController.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Text.Encoding.CodePages.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Text.Encoding.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Text.Encoding.Extensions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Text.RegularExpressions.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.AccessControl.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.Overlapped.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.Tasks.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.Tasks.Parallel.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.Thread.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.ThreadPool.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Threading.Timer.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.ReaderWriter.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XDocument.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XmlDocument.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XmlSerializer.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XPath.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XPath.XDocument.dll;\
-	$(PS_PROFILE_REF_PATH)\System.Xml.XPath.XmlDocument.dll;\
diff --git a/scripts/powershell.inc b/scripts/powershell.inc
deleted file mode 100644
index 094806d3f..000000000
--- a/scripts/powershell.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# This file includes OneCore powershell CoreCLR references. Do not import this file directly. It is automatically imported
-# when MANAGED_PROFILE=PowerShell is specified in sources file.
-#
-# This file is also depended on by the tool 'TypeCatalogGen.exe'. The tool tries to parse this file to get the list of reference 
-# assemblies used by OneCore powershell, and then use that list to generate the CSharp code for initializing the CoreCLR type
-# catalog cache. That CSharp code will be compiled into 'Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.dll' during the build.
-# For more information about 'TypeCatalogGen.exe', see its source code under 'PSAssemblyLoadContext\TypeCatalogGen'.
-#
-# The parsing rule of this file in 'TypeCatalogGen.exe' is very simple:
-#   - Read each line of this file and trim it;
-#   - Skip comment lines;
-#   - Match the line with the regular expression pattern '^\$\(PS_PROFILE_REF_PATH\)\\(.+);\s*\\$'
-# So when adding new reference assembly entries, please make sure the new lines match the above pattern.
-#
-PROFILE_REF_PATH=$(SDK_REF_PATH)\Profiles
-PS_PROFILE_REF_PATH=$(PROFILE_REF_PATH)\PowerShell
-
-PROFILE_REFERENCES=\
-    $(PS_PROFILE_REF_PATH)\Microsoft.CSharp.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\Microsoft.Win32.Registry.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\Microsoft.Win32.Primitives.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.collections.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Collections.NonGeneric.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.collections.concurrent.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Collections.Specialized.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.ComponentModel.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.ComponentModel.EventBasedAsync.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.ComponentModel.TypeConverter.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.dynamic.runtime.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.globalization.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.diagnostics.debug.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Diagnostics.FileVersionInfo.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.diagnostics.tools.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Diagnostics.TraceSource.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.diagnostics.contracts.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Diagnostics.Process.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.io.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.IO.Pipes.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.io.filesystem.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.IO.FileSystem.DriveInfo.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.io.filesystem.primitives.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.IO.FileSystem.Watcher.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.linq.expressions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.linq.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.net.primitives.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.reflection.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.reflection.primitives.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.reflection.emit.lightweight.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Reflection.Emit.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.reflection.extensions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Reflection.TypeExtensions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.reflection.emit.ilgeneration.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.resources.resourcemanager.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.runtime.interopservices.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Runtime.Handles.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Runtime.Loader.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.runtime.numerics.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.runtime.serialization.primitives.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Runtime.Serialization.Xml.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.runtime.extensions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Runtime.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.text.encoding.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Text.Encoding.Extensions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.text.regularexpressions.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.tasks.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.tasks.parallel.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.timer.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.thread.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.threading.threadpool.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.xml.readerwriter.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Xml.XmlDocument.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Xml.XmlSerializer.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Xml.XPath.XmlDocument.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Xml.XPath.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Encoding.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Security.Cryptography.RandomNumberGenerator.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Security.Cryptography.X509Certificates.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Security.Cryptography.Encryption.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.security.securestring.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.security.principal.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.objectmodel.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\system.console.metadata_dll; \
-    $(PS_PROFILE_REF_PATH)\System.Net.NetworkInformation.metadata_dll;\
-    $(PS_PROFILE_REF_PATH)\mscorlib.metadata_dll;\
diff --git a/src/monad b/src/monad
index 3a92ed01b..a4db8beb6 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit 3a92ed01b568e427b613469542f459047a5985f8
+Subproject commit a4db8beb6ee35b667351ada3cdc6766fa5407dc7
diff --git a/src/monad-ext b/src/monad-ext
index ea31eca62..8b2027617 160000
--- a/src/monad-ext
+++ b/src/monad-ext
@@ -1 +1 @@
-Subproject commit ea31eca6223992fa9729af67518930b6b45829d3
+Subproject commit 8b2027617092bc93c4f2977b218145e9b93ec3f3
diff --git a/src/monad-native b/src/monad-native
index 5693da6a4..d1de7e28c 160000
--- a/src/monad-native
+++ b/src/monad-native
@@ -1 +1 @@
-Subproject commit 5693da6a46e8c4d63a49a6dbc6be3081ce7d0d08
+Subproject commit d1de7e28c52a87a0804b76445a07b1d122417436