diff --git a/Changelog.md b/Changelog.md
index 75e8c1e142568bbec7e354c50fd8ec37295d77be..765c020d79022cddca1992a80c3e672fa1ad3a88 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,8 @@ OpenCore Changelog
 - Fixed CPU bus ratio calculation for Nehalem and Westmere
 - Fixed CPU package calculation on MacPro5,1 and similar
 - Improved OpenCore rerun detection for new versions
+- Fixed loading picker on boot failure when it is hidden
+- Added PMC ACPI sample for 300-series chipsets
 
 #### v0.5.4
 - Added Enter key handling in boot menu for quick proceed
diff --git a/Docs/AcpiSamples/SSDT-ALS0.dsl b/Docs/AcpiSamples/SSDT-ALS0.dsl
index 4b4b516da0479723e62a404053107a5a4144b7a2..940cc861c6218772d5c91c59f14bced065d241a6 100644
--- a/Docs/AcpiSamples/SSDT-ALS0.dsl
+++ b/Docs/AcpiSamples/SSDT-ALS0.dsl
@@ -34,4 +34,3 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "ALS0", 0x00000000)
         }
     }
 }
-
diff --git a/Docs/AcpiSamples/SSDT-AWAC.dsl b/Docs/AcpiSamples/SSDT-AWAC.dsl
index 58c6529ba7b0313d329e010f6260dfdd7faac310..6b27a2cc7f37ae10f062eab18ed054ee43981964 100644
--- a/Docs/AcpiSamples/SSDT-AWAC.dsl
+++ b/Docs/AcpiSamples/SSDT-AWAC.dsl
@@ -23,4 +23,3 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "AWAC", 0x00000000)
         }
     }
 }
-
diff --git a/Docs/AcpiSamples/SSDT-EC-USBX.dsl b/Docs/AcpiSamples/SSDT-EC-USBX.dsl
index 8898062a4e39fe7f1c6533080f8732cc15299b45..8ed1a613efbd6ddcdd7baaeadc5ca94a7d693c2c 100644
--- a/Docs/AcpiSamples/SSDT-EC-USBX.dsl
+++ b/Docs/AcpiSamples/SSDT-EC-USBX.dsl
@@ -98,4 +98,3 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "SsdtEC", 0x00001000)
         }
     }
 }
-
diff --git a/Docs/AcpiSamples/SSDT-PLUG.dsl b/Docs/AcpiSamples/SSDT-PLUG.dsl
index b2c6d1f1792924ec39125d5f1254d0275be7f6fb..b6004b91264f554a6f236b92e49bb82407b3e874 100644
--- a/Docs/AcpiSamples/SSDT-PLUG.dsl
+++ b/Docs/AcpiSamples/SSDT-PLUG.dsl
@@ -48,4 +48,3 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "CpuPlug", 0x00003000)
         }
     }
 }
-
diff --git a/Docs/AcpiSamples/SSDT-PMC.dsl b/Docs/AcpiSamples/SSDT-PMC.dsl
new file mode 100644
index 0000000000000000000000000000000000000000..6f5f866a9d88a5760371cb8fef08f652e866e8cf
--- /dev/null
+++ b/Docs/AcpiSamples/SSDT-PMC.dsl
@@ -0,0 +1,52 @@
+/*
+ * Intel 300-series PMC support for macOS
+ *
+ * Starting from Z390 chipsets PMC (D31:F2) is only available through MMIO.
+ * Since there is no standard device for PMC in ACPI, Apple introduced its
+ * own naming "APP9876" to access this device from AppleIntelPCHPMC driver.
+ * To avoid confusion we disable this device for all other operating systems,
+ * as they normally use another non-standard device with "PNP0C02" HID and
+ * "PCHRESV" UID.
+ *
+ * On certain implementations, including APTIO V, PMC MMIO mapping is required
+ * for NVRAM access. The reason for this is still quite unclear, as SPI is
+ * located in higher addresses:
+ * 0xFE000000~0xFE00FFFF - PMC MBAR
+ * 0xFE010000~0xFE010FFF - SPI BAR0
+ * 0xFE020000~0xFE035FFF - SerialIo BAR in ACPI mode
+ *
+ * PMC device has nothing to do to LPC bus, but is added to its scope for
+ * faster initialisation. If we add it to PCI0, where it normally exists,
+ * it will start in the end of PCI configuration, which is too late for
+ * NVRAM support.
+ */
+DefinitionBlock ("", "SSDT", 2, "ACDT", "PMCR", 0x00001000)
+{
+    External (_SB_.PCI0.LPCB, DeviceObj)
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        Device (PMCR)
+        {
+            Name (_HID, EisaId ("APP9876"))  // _HID: Hardware ID
+            Method (_STA, 0, NotSerialized)  // _STA: Status
+            {
+                If (_OSI ("Darwin"))
+                {
+                    Return (0x0B)
+                }
+                Else
+                {
+                    Return (Zero)
+                }
+            }
+            Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+            {
+                Memory32Fixed (ReadWrite,
+                    0xFE000000,         // Address Base
+                    0x00010000,         // Address Length
+                    )
+            })
+        }
+    }
+}
diff --git a/Docs/AcpiSamples/SSDT-RTC0.dsl b/Docs/AcpiSamples/SSDT-RTC0.dsl
index bba76ff5f9110e00958aaac8a1eac67ec9917859..24f3161c288a3e84a33d5df99099d0b01ae35dc2 100644
--- a/Docs/AcpiSamples/SSDT-RTC0.dsl
+++ b/Docs/AcpiSamples/SSDT-RTC0.dsl
@@ -36,4 +36,4 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "RTC0", 0x00000000)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Docs/AcpiSamples/SSDT-SBUS-MCHC.dsl b/Docs/AcpiSamples/SSDT-SBUS-MCHC.dsl
index 969a80cc4ff2789a92556f974956c5062e4d8c42..7e72d699e468dbf0d6ca1d56e06025abf3319d0e 100644
--- a/Docs/AcpiSamples/SSDT-SBUS-MCHC.dsl
+++ b/Docs/AcpiSamples/SSDT-SBUS-MCHC.dsl
@@ -70,4 +70,3 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "MCHCSBUS", 0x00000000)
         Return (Zero)
     }
 }
-