diff --git a/boards/acsip_s76s.json b/boards/acsip_s76s.json
new file mode 100644
index 00000000..04a5e579
--- /dev/null
+++ b/boards/acsip_s76s.json
@@ -0,0 +1,39 @@
+{
+  "build": {
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32L073xx",
+    "f_cpu": "32000000L",
+    "framework_extra_flags": {
+      "arduino": "-D__CORTEX_SC=0 -DCUSTOM_PERIPHERAL_PINS"
+    },
+    "mcu": "stm32l073rz",
+    "product_line": "STM32L073xx",
+    "variant": "STM32L0xx/L072R(B-Z)T_L073R(B-Z)T_L083R(B-Z)T"
+  },
+  "debug": {
+    "jlink_device": "STM32L073RZ",
+    "openocd_target": "stm32l0",
+    "svd_path": "STM32L07x.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "stm32cube",
+    "libopencm3"
+  ],
+  "name": "ACSIP S76S",
+  "upload": {
+    "maximum_ram_size": 20480,
+    "maximum_size": 196608,
+    "protocol": "stlink",
+    "protocols": [
+      "jlink",
+      "cmsis-dap",
+      "stlink",
+      "blackmagic",
+      "mbed"
+    ]
+  },
+  "url": "https://www.acsip.com.tw/index.php?action=products-detail&fid1=19&fid2=&fid3=&id=79",
+  "vendor": "ACSIP"
+}
diff --git a/boards/agafia_sg0.json b/boards/agafia_sg0.json
new file mode 100644
index 00000000..0d137b48
--- /dev/null
+++ b/boards/agafia_sg0.json
@@ -0,0 +1,43 @@
+{
+  "build": {
+    "arduino": {
+      "variant_h": "variant_AGAFIA_SG0.h"
+    },
+    "core": "stm32",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32G0xx -DSTM32G071xx",
+    "f_cpu": "64000000L",
+    "framework_extra_flags": {
+      "arduino": "-D__CORTEX_SC=0"
+    },
+    "mcu": "stm32g071rbt6",
+    "product_line": "STM32G071xx",
+    "variant": "STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)"
+  },
+  "debug": {
+    "jlink_device": "STM32G071RB",
+    "openocd_target": "stm32g0x",
+    "svd_path": "STM32G071.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "libopencm3",
+    "stm32cube"
+  ],
+  "name": "Sigma IC AGAFIA SG0",
+  "upload": {
+    "maximum_ram_size": 36864,
+    "maximum_size": 131072,
+    "protocol": "stlink",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "jlink",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.sigmaic.com/store/p7/agafia-sgo.html",
+  "vendor": "Sigma IC"
+}
diff --git a/boards/blackpill_f401cc.json b/boards/blackpill_f401cc.json
index 10a10fe7..ae231db4 100644
--- a/boards/blackpill_f401cc.json
+++ b/boards/blackpill_f401cc.json
@@ -36,6 +36,6 @@
       "dfu"
     ]
   },
-  "url": "https://github.com/WeActTC/MiniSTM32F4x1",
+  "url": "https://www.weact-tc.cn/",
   "vendor": "WeAct Studio"
 }
diff --git a/boards/blackpill_f411ce.json b/boards/blackpill_f411ce.json
index 474ef342..dae30fbd 100644
--- a/boards/blackpill_f411ce.json
+++ b/boards/blackpill_f411ce.json
@@ -1,5 +1,8 @@
 {
   "build": {
+    "arduino": {
+      "variant_h": "variant_BLACKPILL_F401Cx.h"
+    },
     "core": "stm32",
     "cpu": "cortex-m4",
     "extra_flags": "-DSTM32F4xx -DSTM32F411xE",
diff --git a/boards/btt_ebb42_v1_1.json b/boards/btt_ebb42_v1_1.json
new file mode 100644
index 00000000..6d2a76fa
--- /dev/null
+++ b/boards/btt_ebb42_v1_1.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+      "variant_h": "variant_EBB42_V1_1.h"
+    },
+    "core": "stm32",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32G0xx -DSTM32G0B1xx",
+    "f_cpu": "64000000L",
+    "framework_extra_flags": {
+      "arduino": "-D__CORTEX_SC=0 -DARDUINO_EBB42_V1_1"
+    },
+    "mcu": "stm32g0b1ret6",
+    "product_line": "STM32G0B1xx",
+    "variant": "STM32G0xx/G0B1C(B-C-E)(T-U)_G0C1C(C-E)(T-U)"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32G0B1RE",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32g0x",
+    "svd_path": "STM32G0B1.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "stm32cube"
+  ],
+  "name": "Big Tree Tech EBB42 V1.1",
+  "upload": {
+    "maximum_ram_size": 147456,
+    "maximum_size": 131072,
+    "protocol": "stlink",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "dfu",
+      "jlink",
+      "serial",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://github.com/bigtreetech/EBB/tree/master/EBB%20CAN%20V1.1%20(STM32G0B1)/EBB42%20CAN%20V1.1",
+  "vendor": "Big Tree Tech"
+}
diff --git a/boards/nucleo_f722ze.json b/boards/nucleo_f722ze.json
index 6197d297..8b2a530f 100644
--- a/boards/nucleo_f722ze.json
+++ b/boards/nucleo_f722ze.json
@@ -4,7 +4,8 @@
     "extra_flags": "-DSTM32F722xx",
     "f_cpu": "216000000L",
     "mcu": "stm32f722zet6",
-    "product_line": "STM32F722xx"
+    "product_line": "STM32F722xx",
+    "variant": "STM32F7xx/F722Z(C-E)T_F732ZET"
   },
   "connectivity": [
     "can"
@@ -22,13 +23,14 @@
     "svd_path": "STM32F722.svd"
   },
   "frameworks": [
+    "arduino",
     "cmsis",
     "stm32cube",
     "libopencm3"
   ],
   "name": "ST Nucleo F722ZE",
   "upload": {
-    "maximum_ram_size": 262144,
+    "maximum_ram_size": 196608,
     "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [
diff --git a/boards/nucleo_g070rb.json b/boards/nucleo_g070rb.json
new file mode 100644
index 00000000..ce217143
--- /dev/null
+++ b/boards/nucleo_g070rb.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "core": "stm32",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DSTM32G0xx -DSTM32G070xx",
+    "f_cpu": "64000000L",
+    "framework_extra_flags": {
+      "arduino": "-D__CORTEX_SC=0"
+    },
+    "mcu": "stm32g070rbt6",
+    "product_line": "STM32G070xx",
+    "variant": "STM32G0xx/G070RBT"
+  },
+  "debug": {
+    "default_tools": [
+      "stlink"
+    ],
+    "jlink_device": "STM32G070RB",
+    "onboard_tools": [
+      "stlink"
+    ],
+    "openocd_target": "stm32g0x",
+    "svd_path": "STM32G070.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "cmsis",
+    "libopencm3",
+    "stm32cube"
+  ],
+  "name": "Nucleo G070RB",
+  "upload": {
+    "maximum_ram_size": 36864,
+    "maximum_size": 131072,
+    "protocol": "stlink",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "jlink",
+      "stlink",
+      "mbed"
+    ]
+  },
+  "url": "https://www.st.com/en/evaluation-tools/nucleo-g070rb.html",
+  "vendor": "ST"
+}
diff --git a/boards/nucleo_g0b1re.json b/boards/nucleo_g0b1re.json
index 1ba184c6..aa6f5f0d 100644
--- a/boards/nucleo_g0b1re.json
+++ b/boards/nucleo_g0b1re.json
@@ -9,7 +9,7 @@
     },
     "mcu": "stm32g0b1ret6",
     "product_line": "STM32G0B1xx",
-    "variant": "STM32G0xx/G0B1RBT_G0B1R(C-E)(I-T)_G0C1R(C-E)(I-T)"
+    "variant": "STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T"
   },
   "debug": {
     "default_tools": [
diff --git a/boards/nucleo_h723zg.json b/boards/nucleo_h723zg.json
index 59ae7c48..b9ad14a2 100644
--- a/boards/nucleo_h723zg.json
+++ b/boards/nucleo_h723zg.json
@@ -5,7 +5,8 @@
     "extra_flags": "-DSTM32H7xx -DSTM32H723xx",
     "f_cpu": "550000000L",
     "mcu": "stm32h723zgt6",
-    "product_line": "STM32H723xx"
+    "product_line": "STM32H723xx",
+    "variant": "STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT"
   },
   "connectivity": [
     "can",
@@ -23,13 +24,14 @@
     "svd_path": "STM32H723.svd"
   },
   "frameworks": [
+    "arduino",
     "cmsis",
     "stm32cube",
     "zephyr"
   ],
   "name": "ST Nucleo H723ZG",
   "upload": {
-    "maximum_ram_size": 442368,
+    "maximum_ram_size": 327680,
     "maximum_size": 1048576,
     "protocol": "stlink",
     "protocols": [
diff --git a/boards/nucleo_l073rz.json b/boards/nucleo_l073rz.json
index 5ee1bccd..94450295 100644
--- a/boards/nucleo_l073rz.json
+++ b/boards/nucleo_l073rz.json
@@ -4,7 +4,7 @@
     "extra_flags": "-DSTM32L073xx",
     "f_cpu": "32000000L",
     "framework_extra_flags": {
-      "arduino": "-D__CORTEX_SC=0"
+      "arduino": "-D__CORTEX_SC=0 -DARDUINO_NUCLEO_L073RZ"
     },
     "mcu": "stm32l073rz",
     "product_line": "STM32L073xx",
diff --git a/boards/nucleo_l452re.json b/boards/nucleo_l452re.json
index d7f9b7a5..2fcbc5bc 100644
--- a/boards/nucleo_l452re.json
+++ b/boards/nucleo_l452re.json
@@ -6,7 +6,7 @@
     "f_cpu": "80000000L",
     "mcu": "stm32l452ret6",
     "product_line": "STM32L452xx",
-    "variant": "STM32L4xx/L452R(C-E)(I-T-Y)_L462RE(I-T-Y)"
+    "variant": "STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)"
   },
   "connectivity": [
     "can"
diff --git a/boards/opta.json b/boards/opta.json
new file mode 100644
index 00000000..525e3006
--- /dev/null
+++ b/boards/opta.json
@@ -0,0 +1,51 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "linker_script.ld",
+      "flash_layout": "50_50"
+    },
+    "extra_flags": "-DARDUINO_OPTA",
+    "core": "arduino",
+    "cpu": "cortex-m7",
+    "f_cpu": "480000000L",
+    "mcu": "stm32h747xih6",
+    "variant": "OPTA",
+    "product_line": "STM32H747xx",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0364"
+      ]
+    ]
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "jlink_device": "STM32H747XI_M7",
+    "openocd_target": "stm32h7x_dual_bank"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Arduino Opta",
+  "upload": {
+    "maximum_ram_size": 523624,
+    "maximum_size": 786432,
+    "protocol": "dfu",
+    "protocols": [
+      "cmsis-dap",
+      "dfu",
+      "jlink",
+      "stlink",
+      "mbed"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "offset_address": "0x08040000"
+  },
+  "url": "https://www.arduino.cc/pro/hardware-arduino-opta",
+  "vendor": "Arduino"
+}
diff --git a/builder/main.py b/builder/main.py
index 9125e69d..0cce148d 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -220,7 +220,7 @@ def _jlink_cmd_script(env, source):
     upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
 
     if "arduino" in frameworks:
-        if env.subst("$BOARD").startswith("portenta"):
+        if env.subst("$BOARD").startswith(("portenta", "opta")):
             upload_actions.insert(
                 0,
                 env.VerboseAction(BeforeUpload, "Looking for upload port...")
diff --git a/platform.json b/platform.json
index 5eac394d..b15f86aa 100644
--- a/platform.json
+++ b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-ststm32.git"
   },
-  "version": "15.4.1",
+  "version": "15.5.0",
   "frameworks": {
     "mbed": {
       "package": "framework-mbed",
@@ -192,7 +192,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~4.20200.0"
+      "version": "~4.20400.0"
     },
     "framework-arduinoststm32-maple": {
       "type": "framework",
@@ -216,7 +216,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.1.1"
+      "version": "~3.5.4"
     },
     "framework-stm32cubef0": {
       "type": "framework",
diff --git a/platform.py b/platform.py
index 86440b05..f6468894 100644
--- a/platform.py
+++ b/platform.py
@@ -32,7 +32,7 @@ def configure_default_packages(self, variables, targets):
 
         frameworks = variables.get("pioframework", [])
         if "arduino" in frameworks:
-            if board.startswith("portenta"):
+            if board.startswith(("portenta", "opta")):
                 self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
                 self.frameworks["arduino"][
                     "script"
diff --git a/tests/arduino-blink-different-cores/.gitignore b/tests/arduino-blink-different-cores/.gitignore
index 6c69f4cc..03f4a3c1 100644
--- a/tests/arduino-blink-different-cores/.gitignore
+++ b/tests/arduino-blink-different-cores/.gitignore
@@ -1,2 +1 @@
-.pioenvs
-.piolibdeps
+.pio