diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
index 0de2ed7bde..cc406d5a37 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 55f1bbe161..267ed90903 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 b180e53f76..f20a380b0a 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/Guid.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
index c8c7b2347c..590b40b36f 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 60e8a540e9..53c534a197 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 e30404ac6c..bc13217a96 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/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
index 20b2e13f4c..6f16e3d167 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/Mount.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
index c072d1b7c3..bc3663b610 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/Openinfo.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
index a7dbdff5a6..7050e905cc 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 1fea2f8bfb..f07a8d80a0 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/SmbiosView.efi b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
index c42012d5f2..f30a59e5b9 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 bfef7d7ecd..37232208e1 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/comp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
index 18a81731f7..5b5cfe5d8a 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 5a9aac4425..4ea432d858 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 13f5f87c5d..bfa3adc6a1 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 9cc60ce343..30244f8fc5 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 409ced7d57..9732bb0e4a 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 0dd93b18ce..f9dfb4bdf1 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 51c8f504f9..1af3b70562 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 74574917a8..1e248d8685 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 9112ff4390..da86a1298b 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 1d1de26642..e64e2fcf5d 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 becaa69f11..7f768faac0 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 8296d3596c..80d0b6a314 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 dc60cb2fd4..11a6c60d5d 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 0b00dfdca7..af08c7dfee 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 a1e138a7f7..323ba6bf1b 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 161beb705d..2b845f917c 100644
Binary files a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi and b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
index 099f317d10..fe86e7b352 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 22a33202fb..fb704901c4 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 400fd75e50..c83e37bcdf 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/Guid.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
index a020df96b1..7356ce392b 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 72d75e3e62..2964d7488f 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 dcee859779..9bd75b3d89 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/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
index 0c26b7c0a2..720335d0cf 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/Mount.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
index a000944259..6e1deb3de2 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/Openinfo.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
index 5c36b5f75e..56cb0aaddd 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 dd859ba210..a6433a412e 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/SmbiosView.efi b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
index 245c4a7b38..f1bd734094 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 e2cd0d3dbb..ab219741b7 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/comp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
index 4a99e300af..bb14cccf93 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 064ee3503c..62fa1ebbf5 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 c1b35ca8a7..9a86a1e7a1 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 b5b3762de7..06457c8c7e 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 5640a0a413..b64b2bdbd2 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 69b0869aa5..5bdb5a56c9 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 b25dd11adf..0d667fe044 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 a3fc9c7ab3..a52b718f34 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 0819edb025..89b6db65a8 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 a95bce46cd..0209d2d054 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 8e6527e6cc..33987f1318 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 7c1f8d6550..e65a9f2db4 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 3566ea8315..73977f3dc7 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 46f3c4262e..14c2d346a0 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 1bd1645d34..def14664d3 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 bd8bed3445..3eef3f0de6 100644
Binary files a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi and b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
index 629bfe71e4..7303f26be9 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 a845cfe935..008a3782af 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 2a4573bb7f..ff3857e374 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/Guid.efi b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
index 280d815dd1..87b80c7023 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 af04787a5c..faa1319d38 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 0d9a34179e..7f5fa178d6 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/LoadPciRom.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
index b7527d0807..15f3697399 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/Mount.efi b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
index e16a117c62..1550a12090 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/Openinfo.efi b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
index 83abbcc3ef..f404198fbd 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 e920e3fcab..af161be7b7 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/SmbiosView.efi b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
index aef14b1d53..94059d8b67 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 cda1044ad5..4327ed2c7c 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/comp.efi b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
index c8197c51bb..aafb5ee398 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 a7ea221195..2924e028e8 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 e7bda6910b..344512e405 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 4c37698cf1..420b692d1d 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 7eebf191d8..2f6dd73b88 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 ef4bcad2d6..0f3c9d0a13 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 f44fd911d7..a6ce37c780 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 d0a187d2ab..eab2ad4210 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 af5b50f7ea..27cf8f3a8e 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 71f9892cee..70b32b9768 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 397d1fcc45..9493890b6a 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 29632000af..94b10c2b32 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 2572e69c25..a0795d4a6c 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 11d3e5e675..0dc5148c0e 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 89fc390e3e..031fdbbaa0 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 c5eded90f4..f241c66409 100644
Binary files a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi and b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi differ
diff --git a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
index 2a6ee83a27..fabfc09130 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 53bf962f5a..bc2400586e 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 0fb4c0f719..b0cc2daf5d 100644
Binary files a/EdkShellBinPkg/FullShell/X64/Shell_full.efi and b/EdkShellBinPkg/FullShell/X64/Shell_full.efi differ
diff --git a/EdkShellBinPkg/HotFix.diff b/EdkShellBinPkg/HotFix.diff
deleted file mode 100644
index 48edc4f3f1..0000000000
Binary files a/EdkShellBinPkg/HotFix.diff and /dev/null differ
diff --git a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
index b49e0025e0..c5acda253c 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 e76fe6c476..1904ddf951 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 0e7bb83e0d..6f691758a8 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 23b98dacb3..94b006b653 100644
--- a/EdkShellBinPkg/ReadMe.txt
+++ b/EdkShellBinPkg/ReadMe.txt
@@ -1,14 +1,10 @@
-The binaries of EdkShellBinPkg are generated with Efi-Shell-Dev-Snapshot-20091214.zip (plus a hot-fix see EdkShellbinPkg\HotFix.diff) and build with Edk Compatibility & BaseTools Package (r9623). The binaries are built with no debug information by building with "RELEASE" target.
+The binaries of EdkShellBinPkg are generated with EFI shell project (svn r40) and build with Edk Compatibility & BaseTools Package (r10348). The binaries are built with no debug information by building with "RELEASE" target.
 
 The following steps can help to re-generate these binaries for customization:
-1. Check out EdkCompatibilityPkg (r9623) to $(WORKSPACE)\EdkCompatibilityPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkCompatibilityPkg).
-2. Check out EdkShellPkg(r9623) to $(WORKSPACE)\EdkShellPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellPkg).
-3a.Check out Edk Shell project source (r36) to $(WORKSPACE) (svn http://efi-shell.svn.sourceforge.net/svnroot/efi-shell/trunk/Shell).  It is read-only and current revison (r36) is identical to Efi-Shell-Dev-Snapshot-20091214.zip. 
-3b.Apply the hot fix in EdkShellBinPkg\HotFix.diff to fix the following issues:
-   Security hole in LoadImage() when EFI_SECURITY_VIOLATION status is returned.
-   Load.efi to load 32bit driver in 64bit platform causing system hang.
-   Fix for PCI multi-segment support.
-4. Update to the newest BaseTools package (r9623) to $(WORKSPACE) (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/BaseTools).
+1. Check out EdkCompatibilityPkg (r10348) to $(WORKSPACE)\EdkCompatibilityPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkCompatibilityPkg).
+2. Check out EdkShellPkg(r10348) to $(WORKSPACE)\EdkShellPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellPkg).
+3. Check out Edk Shell project source (r40) to $(WORKSPACE) (svn http://efi-shell.svn.sourceforge.net/svnroot/efi-shell/trunk/Shell). 
+4. Update to the newest BaseTools package (r10348) to $(WORKSPACE) (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/BaseTools).
 5. Under workspace directory (i.e. c:\EdkII), 
    To generate Minimum Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\Shell.inf -b RELEASE" 
    To generate Full Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\ShellFull.inf -b RELEASE"