diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 8827b03..069331f 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -50,6 +50,10 @@ on post-fs-data
     # Speaker amp permission
     chmod 644 /mnt/vendor/persist/audio/speaker.cal
 
+    # Allow secure_element group to read / write ST33 SPI state
+    chown secure_element secure_element  /sys/class/st33spi/st33spi/st33spi_state
+    chmod 0660  /sys/class/st33spi/st33spi/st33spi_state
+
 service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
     -m/vendor/etc/wifi/p2p_supplicant.conf \
@@ -93,4 +97,4 @@ on property:vendor.device.modules.ready=1
     chown system system /proc/focaltech_touch/selftest/Scap_CB
     chown system system /proc/focaltech_touch/selftest/Scap_Rawdata
     chown system system /proc/focaltech_touch/selftest/Short
-    chown system system /proc/focaltech_touch/selftest/Strength
\ No newline at end of file
+    chown system system /proc/focaltech_touch/selftest/Strength
diff --git a/device-cheetah.mk b/device-cheetah.mk
index dbe924c..adeae7d 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -209,6 +209,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.zram.size=3g
 
+# Increment the SVN for any official public releases
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.vendor.build.svn=1
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2
diff --git a/device-panther.mk b/device-panther.mk
index 979ef35..3dec34b 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -201,6 +201,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.zram.size=3g
 
+# Increment the SVN for any official public releases
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.vendor.build.svn=1
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2
diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index 4d73818..b119e7f 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -69,7 +69,7 @@
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
+       ExtL5Bias="20.1"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 634e21d..760d30b 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -69,7 +69,7 @@
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
+       ExtL5Bias="21.2"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 7a60567..d9ca029 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -68,7 +68,7 @@
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
+       ExtL5Bias="20.1"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 92526b5..53fe55c 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -68,7 +68,7 @@
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
        RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
+       ExtL5Bias="21.2"
 
        WarmStandbyTimeout1Seconds="10"
        WarmStandbyTimeout2Seconds="15"
diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index 0dccf72..e105b3f 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -126,7 +126,8 @@
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
         "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "80 10 80"
       ],
       "ResetOnInit": true
     },
@@ -798,7 +799,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -876,7 +877,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index e79173c..6504058 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -126,7 +126,8 @@
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
         "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "80 10 80"
       ],
       "ResetOnInit": true
     },
@@ -786,7 +787,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -864,7 +865,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index c2df4a9..04530fa 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -598,7 +598,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -607,8 +607,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {
diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json
index c75ce64..cf069aa 100644
--- a/thermal_info_config_cloudripper.json
+++ b/thermal_info_config_cloudripper.json
@@ -142,22 +142,14 @@
                 "NAN",
                 80,
                 "NAN",
-                90,
-                93,
-                96,
+                "NAN",
+                "NAN",
+                "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":300000,
-            "PassiveDelay":5000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"batoilo",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index b64e11f..f698199 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -598,7 +598,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -607,8 +607,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {
diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index ba85ef8..85d91b7 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -140,7 +140,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -149,8 +149,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {