diff --git a/CHANGELOG.md b/CHANGELOG.md
index f46a60714..420c5dd71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ statistics: fix display of month number in continuous date axis
 statistics: fix range of continuous date axis
 desktop: fix dive time display in time shift dialog
 libdivecomputer: garmin: relax string parsing sanity checks
+libdivecomputer: add Cressi Donatello, Scubapro G2 TEK, Oceanic Geo Air, Scorpena Alpha
 
 ---
 * Always add new entries at the very top of this file above other existing entries and this note.
diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html
index e62569bc0..ac7ecbc36 100644
--- a/SupportedDivecomputers.html
+++ b/SupportedDivecomputers.html
@@ -21,7 +21,7 @@
 	    <li>Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H</li></ul>
     </dd>
     <dt>Cressi</dt><dd><ul>
-	    <li>Cartesio, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton</li></ul>
+	    <li>Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton</li></ul>
     </dd>
     <dt>Crest</dt><dd><ul>
 	    <li>CR-4</li></ul>
@@ -60,7 +60,7 @@
 	    <li>Extreme</li></ul>
     </dd>
     <dt>Oceanic</dt><dd><ul>
-	    <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro</li></ul>
+	    <li>Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, Geo Air, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro</li></ul>
     </dd>
     <dt>Oceans</dt><dd><ul>
 	    <li>S1</li></ul>
@@ -71,8 +71,11 @@
     <dt>Reefnet</dt><dd><ul>
 	    <li>Sensus, Sensus Pro, Sensus Ultra</li></ul>
     </dd>
+    <dt>Scorpena</dt><dd><ul>
+	    <li>Alpha</li></ul>
+    </dd>
     <dt>Scubapro</dt><dd><ul>
-	    <li>Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
+	    <li>Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, G2 TEK, Mantis, Mantis 2, Meridian, XTender 5</li></ul>
     </dd>
     <dt>Seabaer</dt><dd><ul>
 	    <li>T1, H3, HUDC</li></ul>
diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt
index 66c23aa27..528da9550 100644
--- a/SupportedDivecomputers.txt
+++ b/SupportedDivecomputers.txt
@@ -6,7 +6,7 @@ Atomic Aquatics: Cobalt, Cobalt 2
 Beuchat: Mundial 2, Mundial 3, Voyager 2G
 Citizen: Hyper Aqualand
 Cochran: Commander I, Commander II, Commander TM, EMC-14, EMC-16, EMC-20H
-Cressi: Cartesio, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton
+Cressi: Cartesio, Donatello, Drake, Edy, Giotto, Goa, Leonardo, Michelangelo, Neon, Newton
 Crest: CR-4
 Deep Six: Excursion
 Deepblu: Cosmiq+
@@ -19,11 +19,12 @@ Hollis: DG02, DG03, TX1
 Liquivision: Kaon, Lynx, Xen, Xeo
 Mares: Airlab, Darwin, Darwin Air, Genius, Horizon, Icon HD, Icon HD Net Ready, M1, M2, Matrix, Nemo, Nemo Air, Nemo Apneist, Nemo Excel, Nemo Steel, Nemo Titanium, Nemo Wide, Nemo Wide 2, Puck, Puck 2, Puck Air, Puck Pro, Puck Pro +, Quad, Quad Air, Smart, Smart Air, Smart Apnea
 McLean: Extreme
-Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro
+Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, F10, F11, Geo, Geo 2.0, Geo 4.0, Geo Air, OC1, OCS, OCi, Pro Plus 2, Pro Plus 2.1, Pro Plus 3, Pro Plus 4, Pro Plus X, VT 4.1, VT Pro, VT3, VT4, VTX, Veo 1.0, Veo 180, Veo 2.0, Veo 200, Veo 250, Veo 3.0, Veo 4.0, Versa Pro
 Oceans: S1
 Ratio: iDive Color Deep, iDive Color Easy, iDive Color Fancy, iDive Color Free, iDive Color Pro, iDive Color Reb, iDive Color Tech+, iDive Deep, iDive Easy, iDive Fancy, iDive Free, iDive Pro, iDive Reb, iDive Tech+, iX3M 2 Deep, iX3M 2 Easy, iX3M 2 Gauge, iX3M 2 Pro, iX3M 2 Tech+, iX3M 2021 GPS Deep, iX3M 2021 GPS Easy, iX3M 2021 GPS Fancy, iX3M 2021 GPS Pro , iX3M 2021 GPS Reb, iX3M 2021 GPS Tech+, iX3M 2021 Pro Deep, iX3M 2021 Pro Easy, iX3M 2021 Pro Fancy, iX3M 2021 Pro Pro, iX3M 2021 Pro Reb, iX3M 2021 Pro Tech+, iX3M GPS Deep, iX3M GPS Easy, iX3M GPS Fancy, iX3M GPS Pro , iX3M GPS Reb, iX3M GPS Tech+, iX3M Pro Deep, iX3M Pro Easy, iX3M Pro Fancy, iX3M Pro Pro, iX3M Pro Reb, iX3M Pro Tech+
 Reefnet: Sensus, Sensus Pro, Sensus Ultra
-Scubapro: Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, Mantis, Mantis 2, Meridian, XTender 5
+Scorpena: Alpha
+Scubapro: Aladin A1, Aladin A2, Aladin H Matrix, Aladin Sport Matrix, Aladin Square, Chromis, G2, G2 Console, G2 HUD, G2 TEK, Mantis, Mantis 2, Meridian, XTender 5
 Seabaer: T1, H3, HUDC
 Seac: Action, Guru, Jack, Screen
 Seemann: XP5
diff --git a/libdivecomputer b/libdivecomputer
index 064e19831..7efedfbb2 160000
--- a/libdivecomputer
+++ b/libdivecomputer
@@ -1 +1 @@
-Subproject commit 064e198315715e4e03b404e23f5251734fdf283b
+Subproject commit 7efedfbb2b91a660e496cf3ced9cc115bab9006f