diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0
index 47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553..646c3f4eeae648ffb2cc7dca041d414c4b42c88a 160000
--- a/libs/mavlink/include/mavlink/v2.0
+++ b/libs/mavlink/include/mavlink/v2.0
@@ -1 +1 @@
-Subproject commit 47d2375dc44a5c4d936824a7a6ce4dc8a2fbc553
+Subproject commit 646c3f4eeae648ffb2cc7dca041d414c4b42c88a
diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index 146b048e000984779f81d44d45ebc648b0928983..c28e50776e0ac7e74f745c7e6aa7f8766204ab60 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -946,8 +946,14 @@ void MockLink::_sendGpsRawInt(void)
                                       UINT16_MAX, UINT16_MAX,                // HDOP/VDOP not known
                                       UINT16_MAX,                            // velocity not known
                                       UINT16_MAX,                            // course over ground not known
-                                      8);                                    // satellite count
-    respondWithMavlinkMessage(msg);
+                                      8,                                     // satellite count
+                                      //-- Extension
+                                      0,                                    // Altitude (above WGS84, EGM96 ellipsoid), in meters * 1000 (positive for up).
+                                      0,                                    // Position uncertainty in meters * 1000 (positive for up).
+                                      0,                                    // Altitude uncertainty in meters * 1000 (positive for up).
+                                      0,                                    // Speed uncertainty in meters * 1000 (positive for up).
+                                      0);                                   // Heading / track uncertainty in degrees * 1e5.
+        respondWithMavlinkMessage(msg);
 }
 
 void MockLink::_sendStatusTextMessages(void)