diff --git a/BaseTools/ImageTool/Makefile b/BaseTools/ImageTool/Makefile
index a2b5888c29..9dc5b0cffc 100644
--- a/BaseTools/ImageTool/Makefile
+++ b/BaseTools/ImageTool/Makefile
@@ -28,10 +28,13 @@ BASE = $(UDK_PATH)\MdePkg\Library\BaseLib
 OUT  = $(UDK_PATH)\MdePkg\Library\UefiDebugLibConOut
 PRIN = $(UDK_PATH)\MdePkg\Library\BasePrintLib
 ERRO = $(UDK_PATH)\MdePkg\Library\BaseDebugPrintErrorLevelLib
+BMPN = $(UDK_PATH)\MdeModulePkg\Library\BaseMemoryProfileLibNull
+CMEM = $(UDK_PATH)\MdeModulePkg\Library\CommonMemoryAllocationLib
 USER = $(OC_USER)\User\Library
 OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj CheckSum.obj
 OBJECTS = $(OBJECTS) {$(OUT)}DebugLib.obj {$(PRIN)}PrintLib.obj PrintLibInternal.obj {$(ERRO)}BaseDebugPrintErrorLevelLib.obj
 OBJECTS = $(OBJECTS) {$(USER)}UserFile.obj UserBaseMemoryLib.obj UserMath.obj UserPcd.obj UserMisc.obj UserGlobalVar.obj UserBootServices.obj
+OBJECTS = $(OBJECTS) {$(BMPN)}BaseMemoryProfileLibNull.obj {$(CMEM)}CommonMemoryAllocationLib.obj {$(CMEM)}CommonMemoryAllocationLibEx.obj
 
 INC = -I . -I $(OC_USER)\User\Include -I $(OC_USER)\Include\Acidanthera
 INC = $(INC) -I $(UDK_PATH)\MdePkg\Include -I $(UDK_PATH)\MdePkg\Include\Library -I $(UDK_PATH)\MdePkg\Include\$(UDK_ARCH)
@@ -83,6 +86,14 @@ cleanall:
   $(CC) -c $(CFLAGS) $(INC) /wd 4005 $< -Fo$@
 	@move $@ $(OUT_DIR)\
 
+{$(BMPN)}.c.obj :
+  $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
+	@move $@ $(OUT_DIR)\
+
+{$(CMEM)}.c.obj :
+  $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
+	@move $@ $(OUT_DIR)\
+
 {$(OUT)}.c.obj :
   $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
 	@move $@ $(OUT_DIR)\
diff --git a/BaseTools/MicroTool/Makefile b/BaseTools/MicroTool/Makefile
index d37ebbadfc..9d9c9dd04f 100644
--- a/BaseTools/MicroTool/Makefile
+++ b/BaseTools/MicroTool/Makefile
@@ -21,10 +21,13 @@ BASE = $(UDK_PATH)\MdePkg\Library\BaseLib
 OUT  = $(UDK_PATH)\MdePkg\Library\UefiDebugLibConOut
 PRIN = $(UDK_PATH)\MdePkg\Library\BasePrintLib
 ERRO = $(UDK_PATH)\MdePkg\Library\BaseDebugPrintErrorLevelLib
+BMPN = $(UDK_PATH)\MdeModulePkg\Library\BaseMemoryProfileLibNull
+CMEM = $(UDK_PATH)\MdeModulePkg\Library\CommonMemoryAllocationLib
 USER = $(OC_USER)\User\Library
 OBJECTS = $(OBJECTS) {$(BASE)}SafeString.obj String.obj SwapBytes16.obj SwapBytes32.obj CpuDeadLoop.obj CheckSum.obj
 OBJECTS = $(OBJECTS) {$(OUT)}DebugLib.obj {$(PRIN)}PrintLib.obj PrintLibInternal.obj {$(ERRO)}BaseDebugPrintErrorLevelLib.obj
 OBJECTS = $(OBJECTS) {$(USER)}UserFile.obj UserBaseMemoryLib.obj UserMath.obj UserPcd.obj UserMisc.obj UserGlobalVar.obj UserBootServices.obj
+OBJECTS = $(OBJECTS) {$(BMPN)}BaseMemoryProfileLibNull.obj {$(CMEM)}CommonMemoryAllocationLib.obj {$(CMEM)}CommonMemoryAllocationLibEx.obj
 
 INC = -I . -I $(OC_USER)\User\Include -I $(OC_USER)\Include\Acidanthera
 INC = $(INC) -I $(UDK_PATH)\MdePkg\Include -I $(UDK_PATH)\MdePkg\Include\Library -I $(UDK_PATH)\MdePkg\Include\$(UDK_ARCH)
@@ -58,6 +61,14 @@ cleanall:
   $(CC) -c $(CFLAGS) $(INC) /wd 4005 $< -Fo$@
 	@move $@ $(OUT_DIR)\
 
+{$(BMPN)}.c.obj :
+  $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
+	@move $@ $(OUT_DIR)\
+
+{$(CMEM)}.c.obj :
+  $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
+	@move $@ $(OUT_DIR)\
+
 {$(OUT)}.c.obj :
   $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
 	@move $@ $(OUT_DIR)\
diff --git a/OpenCorePkg b/OpenCorePkg
index 2002cbfe05..cda8a58595 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 2002cbfe0551970f6a09932741998d5dba67b380
+Subproject commit cda8a58595f933a7ab5c5f8e883ad52f187a5525