diff --git a/Tools/simulation/gazebo/sitl_gazebo b/Tools/simulation/gazebo/sitl_gazebo
index 1b56329b73..0c8b6fd26f 160000
--- a/Tools/simulation/gazebo/sitl_gazebo
+++ b/Tools/simulation/gazebo/sitl_gazebo
@@ -1 +1 @@
-Subproject commit 1b56329b73f68f1480e58b1137b3e5169c7453d1
+Subproject commit 0c8b6fd26fe45f0952ba3d352f68d114754080bf
diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt
index a3bf27ece3..b83ec84c2b 100644
--- a/src/modules/mavlink/CMakeLists.txt
+++ b/src/modules/mavlink/CMakeLists.txt
@@ -50,6 +50,7 @@ add_custom_command(
 		git_mavlink_v2
 		${MAVLINK_GIT_DIR}/pymavlink/tools/mavgen.py
 		${MAVLINK_GIT_DIR}/message_definitions/v1.0/${CONFIG_MAVLINK_DIALECT}.xml
+		${BOARD_DEFCONFIG}
 	COMMENT "Generating Mavlink ${CONFIG_MAVLINK_DIALECT}: ${MAVLINK_GIT_DIR_RELATIVE}/message_definitions/v1.0/${CONFIG_MAVLINK_DIALECT}.xml"
 	USES_TERMINAL
 )
diff --git a/src/modules/mavlink/Kconfig b/src/modules/mavlink/Kconfig
index 5f0af1c7f1..0b77d1124b 100644
--- a/src/modules/mavlink/Kconfig
+++ b/src/modules/mavlink/Kconfig
@@ -7,7 +7,7 @@ menuconfig MODULES_MAVLINK
 menuconfig MAVLINK_DIALECT
 depends on MODULES_MAVLINK
         string "Mavlink dialect"
-        default "standard"
+        default "common"
     help
         Select the Mavlink dialect to generate and use.
 
diff --git a/src/modules/mavlink/mavlink b/src/modules/mavlink/mavlink
index d012c7afd5..0811208443 160000
--- a/src/modules/mavlink/mavlink
+++ b/src/modules/mavlink/mavlink
@@ -1 +1 @@
-Subproject commit d012c7afd5f4e2a9388710596fd3eb9a1b3eb086
+Subproject commit 081120844300d68e90c8c4d40ab4662cb3eb604c