Index: MdeModulePkg.dec
===================================================================
--- MdeModulePkg.dec	(revision 13730)
+++ MdeModulePkg.dec	(working copy)
@@ -827,6 +827,9 @@
 
   ## This PCD specified whether the S.M.A.R.T feature of attached ATA hard disks are enabled.
   gEfiMdeModulePkgTokenSpaceGuid.PcdAtaSmartEnable|TRUE|BOOLEAN|0x00010065
+  
+  ## This PCD specifies whether 1G page table is enabled.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDhcpFastMode|FALSE|BOOLEAN|0x00010066
 
 [PcdsPatchableInModule]
   ## Specify  memory size with page number for PEI code when 
Index: Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
===================================================================
--- Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf	(revision 13730)
+++ Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf	(working copy)
@@ -64,3 +64,5 @@
   gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
   gEfiDhcp4ProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
 
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDhcpFastMode
\ No newline at end of file
Index: Universal/Network/Dhcp4Dxe/Dhcp4Io.c
===================================================================
--- Universal/Network/Dhcp4Dxe/Dhcp4Io.c	(revision 13730)
+++ Universal/Network/Dhcp4Dxe/Dhcp4Io.c	(working copy)
@@ -647,6 +647,14 @@
   //
   Status = DhcpCallUser (DhcpSb, Dhcp4RcvdOffer, Packet, NULL);
 
+  // see if fast-mode DHCP is active
+  if ( PcdGetBool(PcdDhcpFastMode) ) {
+    // choose first offer
+    if (Status == EFI_NOT_READY) {
+      Status = EFI_SUCCESS;
+    }
+  }
+
   if (Status == EFI_SUCCESS) {
     if (DhcpSb->LastOffer != NULL) {
       FreePool (DhcpSb->LastOffer);