diff --git a/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
index 32cf7e30f5..7f2dbcb0d1 100644
Binary files a/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi and b/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi differ
diff --git a/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi b/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi
index c2f4c92b42..2772db4274 100644
Binary files a/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi and b/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi differ
diff --git a/EdkShellBinPkg/FullShell/x64/Shell_full.efi b/EdkShellBinPkg/FullShell/x64/Shell_full.efi
index 3415cbe8f5..8dcba43c32 100644
Binary files a/EdkShellBinPkg/FullShell/x64/Shell_full.efi and b/EdkShellBinPkg/FullShell/x64/Shell_full.efi differ
diff --git a/EdkShellBinPkg/GenBin/Shell_HotFix.diff b/EdkShellBinPkg/GenBin/Shell_HotFix.diff
new file mode 100644
index 0000000000..c023a7759a
--- /dev/null
+++ b/EdkShellBinPkg/GenBin/Shell_HotFix.diff
@@ -0,0 +1,189 @@
+diff -urN Shell1.04\Shell/Library/DPath.c EdkCompatibilityPkg\Shell/Library/DPath.c
+--- Shell1.04\Shell/Library/DPath.c	2007-11-15 14:38:52.000000000 +0800
++++ EdkCompatibilityPkg\Shell/Library/DPath.c	2008-02-25 13:38:07.000000000 +0800
+@@ -1,6 +1,6 @@
+ /*++
+ 
+-Copyright (c) 2005 - 2007, Intel Corporation                                                         
++Copyright (c) 2005 - 2008, Intel Corporation                                                         
+ All rights reserved. This program and the accompanying materials                          
+ are licensed and made available under the terms and conditions of the BSD License         
+ which accompanies this distribution. The full text of the license may be found at         
+@@ -1294,17 +1294,8 @@
+   ASSERT (Str != NULL);
+   ASSERT (DevPath != NULL);
+ 
+-  if (ST->Hdr.Revision > 0x00020000) {
+-    FvPath = DevPath;
+-    CatPrint (Str, L"Fv(%g)", &FvPath->NameGuid);
+-  } else if (ST->Hdr.Revision < 0x00020000) {
+-    //
+-    // MEDIA_FV_FILEPATH_DP_EFI_1_10 == MEDIA_FV_DP == 0x06
+-    //
+-    _DevPathFvFilePath (Str, DevPath);    
+-  } else {
+-    _DevPathNodeUnknown (Str, DevPath);
+-  }
++  FvPath = DevPath;
++  CatPrint (Str, L"Fv(%g)", &FvPath->NameGuid);
+ }
+ #endif
+ 
+@@ -2006,16 +1997,11 @@
+ #if (EFI_SPECIFICATION_VERSION > 0x00020000)
+   MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_EFI_2_00 *FvDevicePathNodeUefi_2_00;
+   
+-  if (ST->Hdr.Revision > 0x00020000) {
++  if (ST->Hdr.Revision != 0x00020000) {
+     if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
+         DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP) {
+       return &FvDevicePathNode->NameGuid;
+     }    
+-  } else if (ST->Hdr.Revision < 0x00020000) {
+-    if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
+-        DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP_EFI_1_10) {
+-      return &FvDevicePathNode->NameGuid;
+-    }    
+   } else {
+     FvDevicePathNodeUefi_2_00 = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_EFI_2_00 *)FvDevicePathNode;
+     if (DevicePathType (&FvDevicePathNodeUefi_2_00->Piwg.Header) == MEDIA_DEVICE_PATH &&
+diff -urN Shell1.04\Shell/Library/DPath.h EdkCompatibilityPkg\Shell/Library/DPath.h
+--- Shell1.04\Shell/Library/DPath.h	2007-11-14 22:48:14.000000000 +0800
++++ EdkCompatibilityPkg\Shell/Library/DPath.h	2008-02-25 13:38:07.000000000 +0800
+@@ -1,6 +1,6 @@
+ /*++
+ 
+-Copyright (c) 2005 - 2007, Intel Corporation                                                         
++Copyright (c) 2005 - 2008, Intel Corporation                                                         
+ All rights reserved. This program and the accompanying materials                          
+ are licensed and made available under the terms and conditions of the BSD License         
+ which accompanies this distribution. The full text of the license may be found at         
+@@ -161,11 +161,6 @@
+ 
+ #if (EFI_SPECIFICATION_VERSION > 0x00020000)
+ //
+-// For EFI1.10 FV file device path
+-//
+-#define MEDIA_FV_FILEPATH_DP_EFI_1_10 0x06
+-
+-//
+ // For UEFI2.0 FV file device path
+ //
+ typedef struct {
+diff -urN Shell1.04\Shell/Library/FileIO.c EdkCompatibilityPkg\Shell/Library/FileIO.c
+--- Shell1.04\Shell/Library/FileIO.c	2006-03-15 11:54:44.000000000 +0800
++++ EdkCompatibilityPkg\Shell/Library/FileIO.c	2008-03-24 13:44:52.000000000 +0800
+@@ -1,6 +1,6 @@
+ /*++
+ 
+-Copyright (c) 2005, Intel Corporation                                                         
++Copyright (c) 2005 - 2008, Intel Corporation                                                         
+ All rights reserved. This program and the accompanying materials                          
+ are licensed and made available under the terms and conditions of the BSD License         
+ which accompanies this distribution. The full text of the license may be found at         
+@@ -253,14 +253,16 @@
+ 
+ --*/
+ {
+-  EFI_STATUS            Status;
+-  EFI_FILE_HANDLE       LastHandle;
+-  FILEPATH_DEVICE_PATH  *FilePathNode;
++  EFI_STATUS                Status;
++  EFI_FILE_HANDLE           LastHandle;
++  FILEPATH_DEVICE_PATH      *FilePathNode;
++  EFI_DEVICE_PATH_PROTOCOL  *AlignedFilePath;
+ 
+   ASSERT (FilePath != NULL);
+   ASSERT (DeviceHandle != NULL);
+   ASSERT (FileHandle != NULL);
+-  
++
++  AlignedFilePath = NULL;
+   //
+   // File the file system for this file path
+   //
+@@ -274,12 +276,26 @@
+   *FileHandle = LibOpenRoot (*DeviceHandle);
+   Status      = *FileHandle ? EFI_SUCCESS : EFI_UNSUPPORTED;
+ 
++  if (EFI_ERROR (Status)) {
++    return Status;
++  }
++
++  //
++  // Duplicate FilePath to make sure it is aligned so that
++  // FilePathNode->PathName below is 16-bit aligned.
++  //
++  AlignedFilePath = DuplicateDevicePath(*FilePath);
++  if (AlignedFilePath == NULL) {
++    (*FileHandle)->Close (*FileHandle);
++    *FileHandle = NULL;
++    return EFI_OUT_OF_RESOURCES;
++  }
++  FilePathNode = (FILEPATH_DEVICE_PATH *)AlignedFilePath;
+   //
+   // To access as a file system, the file path should only
+   // contain file path components.  Follow the file path nodes
+   // and find the target file
+   //
+-  FilePathNode = (FILEPATH_DEVICE_PATH *) *FilePath;
+   while (!IsDevicePathEnd (&FilePathNode->Header)) {
+     //
+     // For file system access each node should be a file path component
+@@ -332,6 +348,7 @@
+   if (EFI_ERROR (Status)) {
+     *FileHandle = NULL;
+   }
++  FreePool(AlignedFilePath);
+ 
+   return Status;
+ }
+diff -urN Shell1.04\Shell/shellenv/var.c EdkCompatibilityPkg\Shell/shellenv/var.c
+--- Shell1.04\Shell/shellenv/var.c	2006-03-07 16:20:44.000000000 +0800
++++ EdkCompatibilityPkg\Shell/shellenv/var.c	2008-02-25 13:38:08.000000000 +0800
+@@ -389,8 +389,15 @@
+ {
+   UINTN       Size;
+   VARIABLE_ID *Var;
++  UINTN       RoundUpValueSize;
+ 
+-  Size  = sizeof (VARIABLE_ID) + StrSize (Name) + ValueSize;
++  //
++  // Variable buffer layout: VARIABLE_ID + Value + Name
++  // We need to round up the variable size to make sure Name is aligned (for IPF).
++  //
++  RoundUpValueSize = (ValueSize % 2) ? (ValueSize + 1) : ValueSize; 
++
++  Size  = sizeof (VARIABLE_ID) + StrSize (Name) + RoundUpValueSize;
+   Var   = AllocateZeroPool (Size);
+   if (Var == NULL) {
+     return NULL;
+@@ -398,7 +405,7 @@
+ 
+   Var->Signature  = VARIABLE_SIGNATURE;
+   Var->u.Value    = ((UINT8 *) Var) + sizeof (VARIABLE_ID);
+-  Var->Name       = (CHAR16 *) (Var->u.Value + ValueSize);
++  Var->Name       = (CHAR16 *) (Var->u.Value + RoundUpValueSize);
+   Var->ValueSize  = ValueSize;
+   CopyMem (Var->u.Value, Value, ValueSize);
+   StrCpy (Var->Name, Name);
+diff -urN Shell1.04\Shell/ver/Ver.inf EdkCompatibilityPkg\Shell/ver/Ver.inf
+--- Shell1.04\Shell/ver/Ver.inf	2007-03-04 23:30:48.000000000 +0800
++++ EdkCompatibilityPkg\Shell/ver/Ver.inf	2008-03-03 13:36:05.000000000 +0800
+@@ -1,6 +1,6 @@
+ #/*++
+ #
+-#  Copyright (c) 2005 - 2007, Intel Corporation                                                         
++#  Copyright (c) 2005 - 2008, Intel Corporation                                                         
+ #  All rights reserved. This program and the accompanying materials                          
+ #  are licensed and made available under the terms and conditions of the BSD License         
+ #  which accompanies this distribution. The full text of the license may be found at         
+@@ -45,7 +45,7 @@
+    Ver.c
+    Ver.h 
+    
+-[sources.ia32|x64]
++[sources.ia32,sources.x64]
+    ia32\ver32.c
+ 
+ [sources.ipf]
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/ia32/Shell.efi
index 5907c3e948..d550a0e462 100644
Binary files a/EdkShellBinPkg/MinimumShell/ia32/Shell.efi and b/EdkShellBinPkg/MinimumShell/ia32/Shell.efi differ
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Shell.efi b/EdkShellBinPkg/MinimumShell/ipf/Shell.efi
index 50f2ea2535..12814e9940 100644
Binary files a/EdkShellBinPkg/MinimumShell/ipf/Shell.efi and b/EdkShellBinPkg/MinimumShell/ipf/Shell.efi differ
diff --git a/EdkShellBinPkg/MinimumShell/x64/Shell.efi b/EdkShellBinPkg/MinimumShell/x64/Shell.efi
index 01bf1ca7aa..3ae4afe9c3 100644
Binary files a/EdkShellBinPkg/MinimumShell/x64/Shell.efi and b/EdkShellBinPkg/MinimumShell/x64/Shell.efi differ
diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt
index 056126fcb8..6718a376d8 100644
--- a/EdkShellBinPkg/ReadMe.txt
+++ b/EdkShellBinPkg/ReadMe.txt
@@ -1,24 +1,12 @@
 The binaries of EdkShellBinPkg are generated with EDK-Shell 1.04 release and build with Edk Compatibility & BaseTools Package
-(r4631)
+(r4927)
 
 The following steps can help to re-generate these binaries for customization:
-1. Check out EdkCompatibilityPkg (r4631) to a directory EdkCompatibilityPkg in workspace (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg). 
-2. Update to the newest BaseTools package.
+1. Check out EdkCompatibilityPkg (r4927) to a directory EdkCompatibilityPkg in workspace (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg). 
+2. Update to the newest BaseTools package. (r4927 or later)
 2. Download EfiShell 1.04.zip from EDK Shell official release https://efi-shell.tianocore.org/servlets/ProjectDocumentList?folderID=52&expandFolder=52&folderID=45
 3. Unzip it to be a sub-directory in EdkCompatibilityPkg , i.e. c:\EdkII\EdkCompatibilityPkg\Shell
-4. Work around an issue in EdkCompatibilityPkg\Shell\ver\Ver.inf to split:
-  [sources.ia32|x64]
-    ia32\ver32.c
-
-  to be:
-  [sources.ia32]
-    ia32\ver32.c
-
-  [sources.x64]
-    ia32\ver32.c
-
-   since current build tools (r4631) do not support this syntax in EDK INF format.
-
+4. Apply a hot fix Shell_HotFix.diff under EdkShellBinPkg\GenBin directory. This is mainly to fix the unaligned device path node access in shell binary and a rare INF format issue in ver.inf. This patch will be integrated into the later official release.
 5. Under workspace directory (i.e. c:\EdkII), execute:
    build -a IA32 -a X64 -a IPF -p EdkShellBinPkg\GenBin\EdkShellPkg.dsc -t WINDDK3790x1830
    The use of WINDDK instead of MYTOOLS is due to the fact that EDK shell source 1.04 is not
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi b/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi
index 886ebbba9e..f66dfe7aa8 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi and b/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Cls.efi b/EdkShellBinPkg/bin/ia32/Apps/Cls.efi
index 7efb7156de..57acdf0172 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Cls.efi and b/EdkShellBinPkg/bin/ia32/Apps/Cls.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Cp.efi b/EdkShellBinPkg/bin/ia32/Apps/Cp.efi
index b6d4327aad..626de1444c 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Cp.efi and b/EdkShellBinPkg/bin/ia32/Apps/Cp.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Date.efi b/EdkShellBinPkg/bin/ia32/Apps/Date.efi
index 0cc071e4fb..4ce77adff9 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Date.efi and b/EdkShellBinPkg/bin/ia32/Apps/Date.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi b/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi
index 99c09a3042..c08eae3a87 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi and b/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Devices.efi b/EdkShellBinPkg/bin/ia32/Apps/Devices.efi
index cc7781b51f..6558dce27f 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Devices.efi and b/EdkShellBinPkg/bin/ia32/Apps/Devices.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi b/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi
index 4eb3e4fddc..2e4a8bae16 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi and b/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi b/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi
index 50d16045ff..c772f0eab1 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi and b/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi
index ee6901957d..54c6a15ebc 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi and b/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi
index 895b8fed65..6c3324f270 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi and b/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Guid.efi b/EdkShellBinPkg/bin/ia32/Apps/Guid.efi
index 13070c4b21..c44751d285 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Guid.efi and b/EdkShellBinPkg/bin/ia32/Apps/Guid.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/IfConfig.efi b/EdkShellBinPkg/bin/ia32/Apps/IfConfig.efi
index 99c1c8f052..68dea1c24e 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/IfConfig.efi and b/EdkShellBinPkg/bin/ia32/Apps/IfConfig.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi b/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi
index 612e24dc4e..921e129349 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi and b/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Load.efi b/EdkShellBinPkg/bin/ia32/Apps/Load.efi
index a815de9115..00d953d1bf 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Load.efi and b/EdkShellBinPkg/bin/ia32/Apps/Load.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi
index 51528d6545..7a26380bc0 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi and b/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Ls.efi b/EdkShellBinPkg/bin/ia32/Apps/Ls.efi
index e0593358b1..6dbe7efd76 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Ls.efi and b/EdkShellBinPkg/bin/ia32/Apps/Ls.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi b/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi
index d80d4fb43b..45572c2b89 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi and b/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mount.efi b/EdkShellBinPkg/bin/ia32/Apps/Mount.efi
index 980a45535b..2fd967e186 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Mount.efi and b/EdkShellBinPkg/bin/ia32/Apps/Mount.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mv.efi b/EdkShellBinPkg/bin/ia32/Apps/Mv.efi
index e336b21356..b2c01e2398 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Mv.efi and b/EdkShellBinPkg/bin/ia32/Apps/Mv.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/NShell.efi b/EdkShellBinPkg/bin/ia32/Apps/NShell.efi
index 2e04570e77..887439c38a 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/NShell.efi and b/EdkShellBinPkg/bin/ia32/Apps/NShell.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi b/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi
index c498b59950..c217808fd8 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi and b/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Ping.efi b/EdkShellBinPkg/bin/ia32/Apps/Ping.efi
index a98972467a..2ec324faa5 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Ping.efi and b/EdkShellBinPkg/bin/ia32/Apps/Ping.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Resets.efi b/EdkShellBinPkg/bin/ia32/Apps/Resets.efi
index a971a369ee..3fd0431f8a 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Resets.efi and b/EdkShellBinPkg/bin/ia32/Apps/Resets.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Rm.efi b/EdkShellBinPkg/bin/ia32/Apps/Rm.efi
index 23b14223eb..7ba4b324ea 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Rm.efi and b/EdkShellBinPkg/bin/ia32/Apps/Rm.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi
index 2c04f132cc..e2f5a01ce0 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi and b/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi
index 06bc3f13cb..465a89fa0e 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Time.efi b/EdkShellBinPkg/bin/ia32/Apps/Time.efi
index 489c6c63e6..13dcffd788 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Time.efi and b/EdkShellBinPkg/bin/ia32/Apps/Time.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Touch.efi b/EdkShellBinPkg/bin/ia32/Apps/Touch.efi
index 49cc7a6e5d..f960c239a4 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Touch.efi and b/EdkShellBinPkg/bin/ia32/Apps/Touch.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Type.efi b/EdkShellBinPkg/bin/ia32/Apps/Type.efi
index 923d1fcaa5..b1c4453577 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Type.efi and b/EdkShellBinPkg/bin/ia32/Apps/Type.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Unload.efi b/EdkShellBinPkg/bin/ia32/Apps/Unload.efi
index ada8964f34..44eaab18e0 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Unload.efi and b/EdkShellBinPkg/bin/ia32/Apps/Unload.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Ver.efi b/EdkShellBinPkg/bin/ia32/Apps/Ver.efi
index ddbe45184f..a1761bbd8b 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Ver.efi and b/EdkShellBinPkg/bin/ia32/Apps/Ver.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Vol.efi b/EdkShellBinPkg/bin/ia32/Apps/Vol.efi
index 4afa7c73b1..364bf1854e 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/Vol.efi and b/EdkShellBinPkg/bin/ia32/Apps/Vol.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/comp.efi b/EdkShellBinPkg/bin/ia32/Apps/comp.efi
index fcfa9dba94..be94165720 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/comp.efi and b/EdkShellBinPkg/bin/ia32/Apps/comp.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/dmem.efi b/EdkShellBinPkg/bin/ia32/Apps/dmem.efi
index 0761e9007a..01e69747ea 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/dmem.efi and b/EdkShellBinPkg/bin/ia32/Apps/dmem.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/dmpstore.efi b/EdkShellBinPkg/bin/ia32/Apps/dmpstore.efi
index e524f42a8c..c6790b7bc4 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/dmpstore.efi and b/EdkShellBinPkg/bin/ia32/Apps/dmpstore.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/edit.efi b/EdkShellBinPkg/bin/ia32/Apps/edit.efi
index 3367d7a463..50f94f56b5 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/edit.efi and b/EdkShellBinPkg/bin/ia32/Apps/edit.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/eficompress.efi b/EdkShellBinPkg/bin/ia32/Apps/eficompress.efi
index 67a1a16926..14eb565f40 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/eficompress.efi and b/EdkShellBinPkg/bin/ia32/Apps/eficompress.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/efidecompress.efi b/EdkShellBinPkg/bin/ia32/Apps/efidecompress.efi
index 4223b97c41..cc17762a20 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/efidecompress.efi and b/EdkShellBinPkg/bin/ia32/Apps/efidecompress.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/err.efi b/EdkShellBinPkg/bin/ia32/Apps/err.efi
index 65ce212bcf..f5310d3534 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/err.efi and b/EdkShellBinPkg/bin/ia32/Apps/err.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/hexedit.efi b/EdkShellBinPkg/bin/ia32/Apps/hexedit.efi
index aa434bf36e..73b7f965e9 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/hexedit.efi and b/EdkShellBinPkg/bin/ia32/Apps/hexedit.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/mem.efi b/EdkShellBinPkg/bin/ia32/Apps/mem.efi
index d7d333b3bc..32cdfff5e0 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/mem.efi and b/EdkShellBinPkg/bin/ia32/Apps/mem.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/memmap.efi b/EdkShellBinPkg/bin/ia32/Apps/memmap.efi
index 77a51628b5..df181734da 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/memmap.efi and b/EdkShellBinPkg/bin/ia32/Apps/memmap.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/mm.efi b/EdkShellBinPkg/bin/ia32/Apps/mm.efi
index fb91e4e7c6..b46c1c4efd 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/mm.efi and b/EdkShellBinPkg/bin/ia32/Apps/mm.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/mode.efi b/EdkShellBinPkg/bin/ia32/Apps/mode.efi
index 1615e1dadb..1825b20807 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/mode.efi and b/EdkShellBinPkg/bin/ia32/Apps/mode.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/pci.efi b/EdkShellBinPkg/bin/ia32/Apps/pci.efi
index c51fff8da0..e8abc4f460 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/pci.efi and b/EdkShellBinPkg/bin/ia32/Apps/pci.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/sermode.efi b/EdkShellBinPkg/bin/ia32/Apps/sermode.efi
index a9a7610d31..6d4cf6f98f 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/sermode.efi and b/EdkShellBinPkg/bin/ia32/Apps/sermode.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/stall.efi b/EdkShellBinPkg/bin/ia32/Apps/stall.efi
index b9ab946512..07bf966aaf 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/stall.efi and b/EdkShellBinPkg/bin/ia32/Apps/stall.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Apps/timezone.efi b/EdkShellBinPkg/bin/ia32/Apps/timezone.efi
index f49d6a01a6..0eb2800da8 100644
Binary files a/EdkShellBinPkg/bin/ia32/Apps/timezone.efi and b/EdkShellBinPkg/bin/ia32/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Shell.efi b/EdkShellBinPkg/bin/ia32/Shell.efi
index 5907c3e948..d550a0e462 100644
Binary files a/EdkShellBinPkg/bin/ia32/Shell.efi and b/EdkShellBinPkg/bin/ia32/Shell.efi differ
diff --git a/EdkShellBinPkg/bin/ia32/Shell_Full.efi b/EdkShellBinPkg/bin/ia32/Shell_Full.efi
index 32cf7e30f5..7f2dbcb0d1 100644
Binary files a/EdkShellBinPkg/bin/ia32/Shell_Full.efi and b/EdkShellBinPkg/bin/ia32/Shell_Full.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi b/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi
index e223b0e0ea..810c03d455 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi and b/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cls.efi b/EdkShellBinPkg/bin/ipf/Apps/Cls.efi
index 2551322ad1..f7dbf3e7de 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Cls.efi and b/EdkShellBinPkg/bin/ipf/Apps/Cls.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cp.efi b/EdkShellBinPkg/bin/ipf/Apps/Cp.efi
index 9d804155d7..5b4b2a8341 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Cp.efi and b/EdkShellBinPkg/bin/ipf/Apps/Cp.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Date.efi b/EdkShellBinPkg/bin/ipf/Apps/Date.efi
index 8d385f6f47..4c456f6f28 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Date.efi and b/EdkShellBinPkg/bin/ipf/Apps/Date.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi b/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi
index ed0f0c2957..a55ee70d25 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi and b/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Devices.efi b/EdkShellBinPkg/bin/ipf/Apps/Devices.efi
index 8675fe25d9..60df6d67ef 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Devices.efi and b/EdkShellBinPkg/bin/ipf/Apps/Devices.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi b/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi
index b3e8210e30..fed8e686df 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi and b/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi b/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi
index 610109d722..efd8042d8e 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi and b/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi
index 2b48dfda59..bef049503b 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi and b/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi
index bddf12f312..3c35d05360 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi and b/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Guid.efi b/EdkShellBinPkg/bin/ipf/Apps/Guid.efi
index 2eab063304..41300dbc8d 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Guid.efi and b/EdkShellBinPkg/bin/ipf/Apps/Guid.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi b/EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi
index 74883683f3..18f80edc91 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi and b/EdkShellBinPkg/bin/ipf/Apps/IfConfig.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi b/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi
index ec6ed67583..5af7e9af59 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi and b/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Load.efi b/EdkShellBinPkg/bin/ipf/Apps/Load.efi
index 84a077e558..16c7b30ff3 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Load.efi and b/EdkShellBinPkg/bin/ipf/Apps/Load.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi
index 4a2cfa1216..d16f36606e 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi and b/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ls.efi b/EdkShellBinPkg/bin/ipf/Apps/Ls.efi
index aecd6c775f..049faae5b4 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Ls.efi and b/EdkShellBinPkg/bin/ipf/Apps/Ls.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi b/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi
index dbbffeb855..eefe73d9bd 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi and b/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mount.efi b/EdkShellBinPkg/bin/ipf/Apps/Mount.efi
index caa57c3bf6..5404faac2e 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Mount.efi and b/EdkShellBinPkg/bin/ipf/Apps/Mount.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mv.efi b/EdkShellBinPkg/bin/ipf/Apps/Mv.efi
index 41f5477be2..135e273a7d 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Mv.efi and b/EdkShellBinPkg/bin/ipf/Apps/Mv.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/NShell.efi b/EdkShellBinPkg/bin/ipf/Apps/NShell.efi
index 17dce2c6a1..aae9370be8 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/NShell.efi and b/EdkShellBinPkg/bin/ipf/Apps/NShell.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi b/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi
index 388f76ce0a..1029942921 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi and b/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ping.efi b/EdkShellBinPkg/bin/ipf/Apps/Ping.efi
index b0946480cb..af2c71cd83 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Ping.efi and b/EdkShellBinPkg/bin/ipf/Apps/Ping.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Resets.efi b/EdkShellBinPkg/bin/ipf/Apps/Resets.efi
index 0318840281..0677172a7d 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Resets.efi and b/EdkShellBinPkg/bin/ipf/Apps/Resets.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Rm.efi b/EdkShellBinPkg/bin/ipf/Apps/Rm.efi
index dc0020716d..4c9b0833b4 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Rm.efi and b/EdkShellBinPkg/bin/ipf/Apps/Rm.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi
index 4e6a96929f..eb35759a8c 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi and b/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi
index 31cc8dd76e..274b7f5d27 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Time.efi b/EdkShellBinPkg/bin/ipf/Apps/Time.efi
index 5f79284c45..9189c3f6a8 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Time.efi and b/EdkShellBinPkg/bin/ipf/Apps/Time.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Touch.efi b/EdkShellBinPkg/bin/ipf/Apps/Touch.efi
index 08a8f6a907..bee0d6f665 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Touch.efi and b/EdkShellBinPkg/bin/ipf/Apps/Touch.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Type.efi b/EdkShellBinPkg/bin/ipf/Apps/Type.efi
index 677e3d02ff..f3244bdb48 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Type.efi and b/EdkShellBinPkg/bin/ipf/Apps/Type.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Unload.efi b/EdkShellBinPkg/bin/ipf/Apps/Unload.efi
index 6b3d012d92..f0e2052ac9 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Unload.efi and b/EdkShellBinPkg/bin/ipf/Apps/Unload.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ver.efi b/EdkShellBinPkg/bin/ipf/Apps/Ver.efi
index 8b13c6008b..b593853426 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Ver.efi and b/EdkShellBinPkg/bin/ipf/Apps/Ver.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Vol.efi b/EdkShellBinPkg/bin/ipf/Apps/Vol.efi
index 3917a93392..67815b094d 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/Vol.efi and b/EdkShellBinPkg/bin/ipf/Apps/Vol.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/comp.efi b/EdkShellBinPkg/bin/ipf/Apps/comp.efi
index ec6d368569..4b12496647 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/comp.efi and b/EdkShellBinPkg/bin/ipf/Apps/comp.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/dmem.efi b/EdkShellBinPkg/bin/ipf/Apps/dmem.efi
index 4588bd0131..2dc4c18a30 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/dmem.efi and b/EdkShellBinPkg/bin/ipf/Apps/dmem.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi b/EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi
index 427283c1a1..5e36a6d90f 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi and b/EdkShellBinPkg/bin/ipf/Apps/dmpstore.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/edit.efi b/EdkShellBinPkg/bin/ipf/Apps/edit.efi
index 243eec55e4..071ff19814 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/edit.efi and b/EdkShellBinPkg/bin/ipf/Apps/edit.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/eficompress.efi b/EdkShellBinPkg/bin/ipf/Apps/eficompress.efi
index 377b316260..e6672db375 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/eficompress.efi and b/EdkShellBinPkg/bin/ipf/Apps/eficompress.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi b/EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi
index bd38991f9d..28074b0660 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi and b/EdkShellBinPkg/bin/ipf/Apps/efidecompress.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/err.efi b/EdkShellBinPkg/bin/ipf/Apps/err.efi
index 485cf7411a..d471cdb0b4 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/err.efi and b/EdkShellBinPkg/bin/ipf/Apps/err.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/hexedit.efi b/EdkShellBinPkg/bin/ipf/Apps/hexedit.efi
index badc491a7b..f86e0a6c29 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/hexedit.efi and b/EdkShellBinPkg/bin/ipf/Apps/hexedit.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mem.efi b/EdkShellBinPkg/bin/ipf/Apps/mem.efi
index 20f15d9438..85ddd42790 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/mem.efi and b/EdkShellBinPkg/bin/ipf/Apps/mem.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/memmap.efi b/EdkShellBinPkg/bin/ipf/Apps/memmap.efi
index 5d1146c826..2d2c0137da 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/memmap.efi and b/EdkShellBinPkg/bin/ipf/Apps/memmap.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mm.efi b/EdkShellBinPkg/bin/ipf/Apps/mm.efi
index cdb15580d2..9d40ddf6cc 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/mm.efi and b/EdkShellBinPkg/bin/ipf/Apps/mm.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/mode.efi b/EdkShellBinPkg/bin/ipf/Apps/mode.efi
index 655e7273e1..cb13b43479 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/mode.efi and b/EdkShellBinPkg/bin/ipf/Apps/mode.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/pci.efi b/EdkShellBinPkg/bin/ipf/Apps/pci.efi
index b6ca38664e..6f3435254e 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/pci.efi and b/EdkShellBinPkg/bin/ipf/Apps/pci.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/sermode.efi b/EdkShellBinPkg/bin/ipf/Apps/sermode.efi
index 57be0fbbcc..b01b07636f 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/sermode.efi and b/EdkShellBinPkg/bin/ipf/Apps/sermode.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/stall.efi b/EdkShellBinPkg/bin/ipf/Apps/stall.efi
index 62df0184d2..0d5ee0c99e 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/stall.efi and b/EdkShellBinPkg/bin/ipf/Apps/stall.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Apps/timezone.efi b/EdkShellBinPkg/bin/ipf/Apps/timezone.efi
index 12c4f08e10..a4e530ac6f 100644
Binary files a/EdkShellBinPkg/bin/ipf/Apps/timezone.efi and b/EdkShellBinPkg/bin/ipf/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Shell.efi b/EdkShellBinPkg/bin/ipf/Shell.efi
index 50f2ea2535..12814e9940 100644
Binary files a/EdkShellBinPkg/bin/ipf/Shell.efi and b/EdkShellBinPkg/bin/ipf/Shell.efi differ
diff --git a/EdkShellBinPkg/bin/ipf/Shell_Full.efi b/EdkShellBinPkg/bin/ipf/Shell_Full.efi
index c2f4c92b42..2772db4274 100644
Binary files a/EdkShellBinPkg/bin/ipf/Shell_Full.efi and b/EdkShellBinPkg/bin/ipf/Shell_Full.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Attrib.efi b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi
index 03a846d3e2..da1244d3f9 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Attrib.efi and b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cls.efi b/EdkShellBinPkg/bin/x64/Apps/Cls.efi
index 937f44cd28..87f80e48cd 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Cls.efi and b/EdkShellBinPkg/bin/x64/Apps/Cls.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cp.efi b/EdkShellBinPkg/bin/x64/Apps/Cp.efi
index 559224ec25..7968557679 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Cp.efi and b/EdkShellBinPkg/bin/x64/Apps/Cp.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Date.efi b/EdkShellBinPkg/bin/x64/Apps/Date.efi
index 15ae39b973..b65c1c6d9d 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Date.efi and b/EdkShellBinPkg/bin/x64/Apps/Date.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Dblk.efi b/EdkShellBinPkg/bin/x64/Apps/Dblk.efi
index dbee6297a2..2f87d8b25c 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Dblk.efi and b/EdkShellBinPkg/bin/x64/Apps/Dblk.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Devices.efi b/EdkShellBinPkg/bin/x64/Apps/Devices.efi
index 2b246fa094..135c0e268e 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Devices.efi and b/EdkShellBinPkg/bin/x64/Apps/Devices.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Devtree.efi b/EdkShellBinPkg/bin/x64/Apps/Devtree.efi
index 3563ebb3bc..f490b4d434 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Devtree.efi and b/EdkShellBinPkg/bin/x64/Apps/Devtree.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drivers.efi b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi
index 938b5c0d94..0513e4754b 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Drivers.efi and b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi
index a5f1dae254..20cce7867a 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi and b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi
index cd19feb92e..fd11390b6b 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi and b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Guid.efi b/EdkShellBinPkg/bin/x64/Apps/Guid.efi
index 3230b387cf..001be9d885 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Guid.efi and b/EdkShellBinPkg/bin/x64/Apps/Guid.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/IfConfig.efi b/EdkShellBinPkg/bin/x64/Apps/IfConfig.efi
index 08c3169029..9478cb21d2 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/IfConfig.efi and b/EdkShellBinPkg/bin/x64/Apps/IfConfig.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi b/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi
index 864e8af46f..08e3888df8 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi and b/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Load.efi b/EdkShellBinPkg/bin/x64/Apps/Load.efi
index 530569abcf..fbdea69135 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Load.efi and b/EdkShellBinPkg/bin/x64/Apps/Load.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi
index 397a6b8f03..6cb97f799d 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi and b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ls.efi b/EdkShellBinPkg/bin/x64/Apps/Ls.efi
index 98e7a7ce44..ea962e4d50 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Ls.efi and b/EdkShellBinPkg/bin/x64/Apps/Ls.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi
index 498e5a4201..1e474d9430 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi and b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mount.efi b/EdkShellBinPkg/bin/x64/Apps/Mount.efi
index cd0341c848..6b34019537 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Mount.efi and b/EdkShellBinPkg/bin/x64/Apps/Mount.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mv.efi b/EdkShellBinPkg/bin/x64/Apps/Mv.efi
index 90c141946b..623a3944d8 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Mv.efi and b/EdkShellBinPkg/bin/x64/Apps/Mv.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/NShell.efi b/EdkShellBinPkg/bin/x64/Apps/NShell.efi
index 66ecc86eaa..d352c863a8 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/NShell.efi and b/EdkShellBinPkg/bin/x64/Apps/NShell.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi b/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi
index 72471b0f1e..f949641b1e 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi and b/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ping.efi b/EdkShellBinPkg/bin/x64/Apps/Ping.efi
index f33849655d..f009b8f44f 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Ping.efi and b/EdkShellBinPkg/bin/x64/Apps/Ping.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Resets.efi b/EdkShellBinPkg/bin/x64/Apps/Resets.efi
index eb2b8ac659..1f12c2f34c 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Resets.efi and b/EdkShellBinPkg/bin/x64/Apps/Resets.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Rm.efi b/EdkShellBinPkg/bin/x64/Apps/Rm.efi
index 75a7cca0bf..b761821de3 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Rm.efi and b/EdkShellBinPkg/bin/x64/Apps/Rm.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi
index 0254783c58..139ea98160 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi and b/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi
index b76d88364b..2922e536d7 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi and b/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Time.efi b/EdkShellBinPkg/bin/x64/Apps/Time.efi
index 3fd35d2d17..8f6b5feb97 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Time.efi and b/EdkShellBinPkg/bin/x64/Apps/Time.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Touch.efi b/EdkShellBinPkg/bin/x64/Apps/Touch.efi
index d994d44be6..c3adf1aab3 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Touch.efi and b/EdkShellBinPkg/bin/x64/Apps/Touch.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Type.efi b/EdkShellBinPkg/bin/x64/Apps/Type.efi
index a0ff5184f8..8d706ba03e 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Type.efi and b/EdkShellBinPkg/bin/x64/Apps/Type.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Unload.efi b/EdkShellBinPkg/bin/x64/Apps/Unload.efi
index 84985c7ac1..87c70629b2 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Unload.efi and b/EdkShellBinPkg/bin/x64/Apps/Unload.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ver.efi b/EdkShellBinPkg/bin/x64/Apps/Ver.efi
index adea15b123..a504d59b3e 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Ver.efi and b/EdkShellBinPkg/bin/x64/Apps/Ver.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/Vol.efi b/EdkShellBinPkg/bin/x64/Apps/Vol.efi
index b6c0890cce..b5eb77a9c0 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/Vol.efi and b/EdkShellBinPkg/bin/x64/Apps/Vol.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/comp.efi b/EdkShellBinPkg/bin/x64/Apps/comp.efi
index 46407e08c9..dbeac5d570 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/comp.efi and b/EdkShellBinPkg/bin/x64/Apps/comp.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/dmem.efi b/EdkShellBinPkg/bin/x64/Apps/dmem.efi
index 8519d7c88c..a4388d0177 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/dmem.efi and b/EdkShellBinPkg/bin/x64/Apps/dmem.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi b/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi
index 8014b79788..dc658fc083 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi and b/EdkShellBinPkg/bin/x64/Apps/dmpstore.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/edit.efi b/EdkShellBinPkg/bin/x64/Apps/edit.efi
index dda54b24e1..89ab56dd72 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/edit.efi and b/EdkShellBinPkg/bin/x64/Apps/edit.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/eficompress.efi b/EdkShellBinPkg/bin/x64/Apps/eficompress.efi
index 20c562dced..955fc3f4d5 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/eficompress.efi and b/EdkShellBinPkg/bin/x64/Apps/eficompress.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi b/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi
index 1970266321..6dbcb9e94b 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi and b/EdkShellBinPkg/bin/x64/Apps/efidecompress.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/err.efi b/EdkShellBinPkg/bin/x64/Apps/err.efi
index 4db623bfb6..feea5ef7c6 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/err.efi and b/EdkShellBinPkg/bin/x64/Apps/err.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/hexedit.efi b/EdkShellBinPkg/bin/x64/Apps/hexedit.efi
index 14e38f2035..7700ac30e3 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/hexedit.efi and b/EdkShellBinPkg/bin/x64/Apps/hexedit.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mem.efi b/EdkShellBinPkg/bin/x64/Apps/mem.efi
index d1279d20d1..d6030ca367 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/mem.efi and b/EdkShellBinPkg/bin/x64/Apps/mem.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/memmap.efi b/EdkShellBinPkg/bin/x64/Apps/memmap.efi
index e23df5080f..51f4051b4c 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/memmap.efi and b/EdkShellBinPkg/bin/x64/Apps/memmap.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mm.efi b/EdkShellBinPkg/bin/x64/Apps/mm.efi
index 4dfafdf245..53cd43ee68 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/mm.efi and b/EdkShellBinPkg/bin/x64/Apps/mm.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/mode.efi b/EdkShellBinPkg/bin/x64/Apps/mode.efi
index 2fa064ff9b..2c5beff9cd 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/mode.efi and b/EdkShellBinPkg/bin/x64/Apps/mode.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/pci.efi b/EdkShellBinPkg/bin/x64/Apps/pci.efi
index 547dfaef33..f9ef0837f3 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/pci.efi and b/EdkShellBinPkg/bin/x64/Apps/pci.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/sermode.efi b/EdkShellBinPkg/bin/x64/Apps/sermode.efi
index 2e4aaa63ea..f44248be84 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/sermode.efi and b/EdkShellBinPkg/bin/x64/Apps/sermode.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/stall.efi b/EdkShellBinPkg/bin/x64/Apps/stall.efi
index c30666e11f..1c6de1a7c7 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/stall.efi and b/EdkShellBinPkg/bin/x64/Apps/stall.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Apps/timezone.efi b/EdkShellBinPkg/bin/x64/Apps/timezone.efi
index 6e59a5021a..a50a0229e7 100644
Binary files a/EdkShellBinPkg/bin/x64/Apps/timezone.efi and b/EdkShellBinPkg/bin/x64/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Shell.efi b/EdkShellBinPkg/bin/x64/Shell.efi
index 01bf1ca7aa..3ae4afe9c3 100644
Binary files a/EdkShellBinPkg/bin/x64/Shell.efi and b/EdkShellBinPkg/bin/x64/Shell.efi differ
diff --git a/EdkShellBinPkg/bin/x64/Shell_full.efi b/EdkShellBinPkg/bin/x64/Shell_full.efi
index 3415cbe8f5..8dcba43c32 100644
Binary files a/EdkShellBinPkg/bin/x64/Shell_full.efi and b/EdkShellBinPkg/bin/x64/Shell_full.efi differ