diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8677237e76..1671f5df8a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,10 +17,12 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v6
+        with:
+          submodules: recursive
 
       - name: Manage Version
         run: |
-          git fetch --prune --unshallow --tags
+          git fetch --prune --unshallow --tags --no-recurse-submodules
           echo "CUR_TAG=$(git tag -l | tail -1)" >> $GITHUB_ENV
           echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
@@ -30,6 +32,10 @@ jobs:
           HOMEBREW_NO_INSTALL_CLEANUP: 1
           HOMEBREW_NO_AUTO_UPDATE: 1
 
+      - name: Fix OpenCorePkg Macro
+        run: |
+          sed -i '' 's|///#define OC_PLATFORM_NVRAM_CONFIG_FIELDS|#define OC_PLATFORM_NVRAM_CONFIG_FIELDS|g' OpenCorePkg/Include/Acidanthera/Library/OcConfigurationLib.h
+
       - name: Build Clover Pack
         run: |
           chmod +x ./buildme
diff --git a/.gitignore b/.gitignore
index 41366c2f78..b2184c1a50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,9 @@ RELEASE_*/
 # Local debug files
 bin/
 DEBUG_REPORT.md
+
+# Build logs
+*.log
+CloverPackage/*.log
+build_failure.log
+buildme_run.log
diff --git a/Clover.dsc b/Clover.dsc
index 67494333ab..c63adb7fe0 100644
--- a/Clover.dsc
+++ b/Clover.dsc
@@ -558,11 +558,11 @@
   }
   OpenCorePkg/Library/OcVariableLib/OcVariableLib.inf {
     <BuildOptions>
-      *_*_*_CC_FLAGS   = $(OC_INCLUDE_FLAG)
+      *_*_*_CC_FLAGS   = $(OC_INCLUDE_FLAG) -Wno-error
   }
   OpenCorePkg/Library/OcMainLib/OcMainLibClover.inf {
     <BuildOptions>
-      *_*_*_CC_FLAGS   = $(OC_INCLUDE_FLAG)
+      *_*_*_CC_FLAGS   = $(OC_INCLUDE_FLAG) -Wno-error
   }
 
 
@@ -1050,7 +1050,7 @@ DEFINE BUILD_OPTIONS=-DIS_UEFI_MODULE -DMDEPKG_NDEBUG -DCLOVER_BUILD -DLESS_DEBU
 
   XCODE:*_*_*_CC_FLAGS = -std=c11 -fno-unwind-tables $(BUILD_OPTIONS) $(XLTO_FLAG)
   XCODE:*_*_*_CXX_FLAGS = -std=c++11 -fno-unwind-tables $(BUILD_OPTIONS) $(XLTO_FLAG)
-  GCC:*_*_*_CC_FLAGS   = -std=c11 $(BUILD_OPTIONS) $(LTO_FLAG)
-  GCC:*_*_*_CXX_FLAGS  =  -std=c++11 $(BUILD_OPTIONS) $(LTO_FLAG)
+  GCC:*_*_*_CC_FLAGS   = -std=c11 $(BUILD_OPTIONS) $(LTO_FLAG) -Wno-error
+  GCC:*_*_*_CXX_FLAGS  =  -std=c++11 $(BUILD_OPTIONS) $(LTO_FLAG) -Wno-error
   #-fanalyzer -Wmismatched-tags 
   #-Weffc++
diff --git a/CloverPackage/package/po/clover.pot b/CloverPackage/package/po/clover.pot
index 156eb435a5..87af04b1aa 100644
--- a/CloverPackage/package/po/clover.pot
+++ b/CloverPackage/package/po/clover.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Clover r5164\n"
-"POT-Creation-Date: 2025-11-07 20:08+0300\n"
+"Project-Id-Version: Clover r5166\n"
+"POT-Creation-Date: 2026-01-09 22:52-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/OpenCorePkg b/OpenCorePkg
index af2fa17bda..71408797c5 160000
--- a/OpenCorePkg
+++ b/OpenCorePkg
@@ -1 +1 @@
-Subproject commit af2fa17bda701ee51bd2875a4d8bdb74597a0704
+Subproject commit 71408797c518459627b05de6f79dd9000b0675d0
diff --git a/rEFIt_UEFI/Platform/Settings.h b/rEFIt_UEFI/Platform/Settings.h
index 4d46665b16..6dbcf15934 100644
--- a/rEFIt_UEFI/Platform/Settings.h
+++ b/rEFIt_UEFI/Platform/Settings.h
@@ -2380,6 +2380,7 @@ class SETTINGS_DATA {
       //  XBool AppleXcpmCfgLock = false;
       XBool AppleXcpmExtraMsrs = false;
       XBool AppleXcpmForceBoost = false;
+      XBool ClearTaskSwitchBit = false;
       //  XBool CustomSmbiosGuid = false;
       XBool DisableIoMapper = false;
       XBool DisableIoMapperMapping = false;
diff --git a/rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h b/rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h
index 9b73677457..bf247e311e 100644
--- a/rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h
+++ b/rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h
@@ -65,6 +65,7 @@ class Quirks_Class : public XmlDict {
   public:
     XmlBool AppleXcpmExtraMsrs = XmlBool();
     XmlBool AppleXcpmForceBoost = XmlBool();
+    XmlBool ClearTaskSwitchBit = XmlBool();
     XmlBool DisableIoMapper = XmlBool();
     XmlBool DisableIoMapperMapping = XmlBool();
     XmlBool DisableLinkeditJettison = XmlBool();
@@ -86,6 +87,10 @@ class Quirks_Class : public XmlDict {
       return AppleXcpmForceBoost.isDefined() ? AppleXcpmForceBoost.value()
                                              : AppleXcpmForceBoost.nullValue;
     };
+    XBool dgetClearTaskSwitchBit() const {
+      return ClearTaskSwitchBit.isDefined() ? ClearTaskSwitchBit.value()
+                                            : ClearTaskSwitchBit.nullValue;
+    };
     XBool dgetDisableIoMapper() const {
       return DisableIoMapper.isDefined() ? DisableIoMapper.value()
                                          : DisableIoMapper.nullValue;
@@ -281,7 +286,7 @@ class Quirks_Class : public XmlDict {
   OcKernelQuirks_Class OcKernelQuirks;
   OcBooterQuirks_Class OcBooterQuirks;
 
-  XmlDictField m_fields[38] = {
+  XmlDictField m_fields[39] = {
       {"AvoidRuntimeDefrag", OcBooterQuirks.AvoidRuntimeDefrag},
       {"DevirtualiseMmio", OcBooterQuirks.DevirtualiseMmio},
       {"DisableSingleUser", OcBooterQuirks.DisableSingleUser},
@@ -308,6 +313,7 @@ class Quirks_Class : public XmlDict {
       {"KernelCache", KernelCache},
       {"AppleXcpmExtraMsrs", OcKernelQuirks.AppleXcpmExtraMsrs},
       {"AppleXcpmForceBoost", OcKernelQuirks.AppleXcpmForceBoost},
+      {"ClearTaskSwitchBit", OcKernelQuirks.ClearTaskSwitchBit},
       {"DisableIoMapper", OcKernelQuirks.DisableIoMapper},
       {"DisableIoMapperMapping", OcKernelQuirks.DisableIoMapperMapping},
       {"DisableLinkeditJettison", OcKernelQuirks.DisableLinkeditJettison},
diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp
index 7c1e5437fe..ac167cef00 100644
--- a/rEFIt_UEFI/refit/main.cpp
+++ b/rEFIt_UEFI/refit/main.cpp
@@ -833,10 +833,10 @@ void debugStartImageWithOC() {
   XStringW devicePathToLookFor;
   //  devicePathToLookFor.takeValueFrom("PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/HD(4,GPT,CA224585-830E-4274-5826-1ACB6DA08A4E,0x299F000,0x4AE6310)/VenMedia(BE74FCF7-0B7C-49F3-9147-01F4042E6842,1ABE434C8D0357398516CFDF0A9DD7EF)");
   //  // Jief High Sierra DevicePath
-  devicePathToLookFor
-      .takeValueFrom("PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/"
-                     "HD(2,GPT,D8C7DA82-1E4C-4579-BA7C-6737A5D43464,0x64028,"
-                     "0x1BF08E8)"); // Jief Big Sur Install device path
+  devicePathToLookFor.takeValueFrom(
+      "PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/"
+      "HD(2,GPT,D8C7DA82-1E4C-4579-BA7C-6737A5D43464,0x64028,"
+      "0x1BF08E8)"); // Jief Big Sur Install device path
   UINTN HandleCount = 0;
   EFI_HANDLE *Handles = NULL;
   Status =
@@ -1303,6 +1303,8 @@ void LOADER_ENTRY::StartLoader() {
         gSettings.Quirks.OcKernelQuirks.AppleXcpmExtraMsrs;
     mOpenCoreConfiguration.Kernel.Quirks.AppleXcpmForceBoost =
         gSettings.Quirks.OcKernelQuirks.AppleXcpmForceBoost;
+    mOpenCoreConfiguration.Kernel.Quirks.ClearTaskSwitchBit =
+        gSettings.Quirks.OcKernelQuirks.ClearTaskSwitchBit;
 #ifndef USE_OC_SECTION_PlatformInfo
     mOpenCoreConfiguration.Kernel.Quirks.CustomSmbiosGuid =
         gSettings.KernelAndKextPatches.KPDELLSMBIOS;