diff --git a/KNOWNISSUES.md b/KNOWNISSUES.md
index d6a71edba9..7748230c15 100644
--- a/KNOWNISSUES.md
+++ b/KNOWNISSUES.md
@@ -7,14 +7,6 @@ temporarily from `Microsoft.PowerShell.Commands.Management` because we
 cannot resolve `[Shell32.ShellFolderItem]` for FullCLR builds. This must be
 fixed ASAP.
 
-## `ImplicitRemotingCommands.cs`
-
-The file `monad\src\commands\utility\ImplicitRemotingCommands.cs` has been
-removed temporarily from `Microsoft.PowerShell.Commands.Utility` because it
-does not build on Core PowerShell, and cannot be guarded with preprocessor
-directives due to the use of here-strings that contain lines starting with `#`,
-which breaks the preprocessor.
-
 ## `Microsoft.Management.Infrastructure.Native`
 
 Windows builds currently use the native stub; this should be replaced with
diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json
index e5a3aa0593..d9cdc92cec 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/project.json
+++ b/src/Microsoft.PowerShell.Commands.Utility/project.json
@@ -98,6 +98,7 @@
         "../monad/monad/src/commands/utility/group-object.cs",
         "../monad/monad/src/commands/utility/Import-LocalizedData.cs",
         "../monad/monad/src/commands/utility/ImportAliasCommand.cs",
+        "../monad/monad/src/commands/utility/ImplicitRemotingCommands.cs",
         "../monad/monad/src/commands/utility/InvokeCommandCmdlet.cs",
         "../monad/monad/src/commands/utility/MatchString.cs",
         "../monad/monad/src/commands/utility/Measure-Object.cs",
diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json
index 6844452065..2e7ab6ea50 100644
--- a/src/Microsoft.PowerShell.Security/project.json
+++ b/src/Microsoft.PowerShell.Security/project.json
@@ -28,19 +28,25 @@
 
     "compileFiles": [
         "../monad/monad/src/security/AclCommands.cs",
+        "../monad/monad/src/security/CertificateCommands.cs",
         "../monad/monad/src/security/CertificateProvider.cs",
+        "../monad/monad/src/security/certificateproviderexceptions.cs",
+        "../monad/monad/src/security/CmsCommands.cs",
         "../monad/monad/src/security/CredentialCommands.cs",
         "../monad/monad/src/security/ExecutionPolicyCommands.cs",
         "../monad/monad/src/security/SecureStringCommands.cs",
         "../monad/monad/src/security/SignatureCommands.cs",
         "../monad/monad/src/security/Utils.cs",
-        "../monad/monad/src/security/certificateproviderexceptions.cs"
+        "../monad/monad/src/singleshell/installer/MshSecurityMshSnapin.cs"
     ],
 
     "namedResource": {
+        "CertificateCommands": "../windows-build/gen/SECURITY/CertificateCommands.resources",
         "CertificateProviderStrings": "../windows-build/gen/SECURITY/CertificateProviderStrings.resources",
+        "CmsCommands": "../windows-build/gen/SECURITY/CmsCommands.resources",
         "ExecutionPolicyCommands": "../windows-build/gen/SECURITY/ExecutionPolicyCommands.resources",
         "SecureStringCommands": "../windows-build/gen/SECURITY/SecureStringCommands.resources",
+        "SecurityMshSnapinResources": "../windows-build/gen/SECURITY/SecurityMshSnapinResources.resources",
         "SignatureCommands": "../windows-build/gen/SECURITY/SignatureCommands.resources",
         "UtilsStrings": "../windows-build/gen/SECURITY/UtilsStrings.resources"
     }
diff --git a/src/monad b/src/monad
index b0a0d11a58..3aec819b82 160000
--- a/src/monad
+++ b/src/monad
@@ -1 +1 @@
-Subproject commit b0a0d11a58f9737da7963bfda46954615261be1d
+Subproject commit 3aec819b82f53b84824b69702975242d6568ca0d
diff --git a/src/windows-build b/src/windows-build
index 0262919b23..994a3f231b 160000
--- a/src/windows-build
+++ b/src/windows-build
@@ -1 +1 @@
-Subproject commit 0262919b23759176be8b301c23044252fa5d1a82
+Subproject commit 994a3f231be9284fef2ea77720a9a72745ca39cc