diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
index a4191af6..e1d7f70d 100644
--- a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
+++ b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -295,7 +295,9 @@ public:
      */
     eProsima_user_DllExport $union.name$()
     {
-        $if(union.defaultMember)$
+        $if(union.defaultAnnotatedMember)$
+        $union.defaultAnnotatedMember.name$_();
+        $elseif(union.defaultMember)$
         $union.defaultMember.name$_();
         $endif$
     }
@@ -510,7 +512,7 @@ private:
         \}
     }; separator="\n"$
 
-    $union.discriminator.typecode.cppTypename$ m__d {$union.defaultvalue$};
+    $union.discriminator.typecode.cppTypename$ m__d {$if(union.defaultAnnotatedValue)$$union.defaultAnnotatedValue$$else$$union.defaultvalue$$endif$};
 
     union
     {
diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
index 5db00506..3d774556 100644
--- a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
+++ b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
@@ -877,7 +877,7 @@ $endif$
 }; separator="\n"$
 if (!tmp_ann_custom_$type.name$.empty())
 {
-    ann_custom_$type.name$ = tmp_ann_custom_$type.name$;
+    ann_custom_$name$ = tmp_ann_custom_$type.name$;
 }
 $endif$
 >>
diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test
index ef234fb8..bebeb286 160000
--- a/thirdparty/dds-types-test
+++ b/thirdparty/dds-types-test
@@ -1 +1 @@
-Subproject commit ef234fb8071c0a93fee23a40537592df7e1778bc
+Subproject commit bebeb2862ebabf6adb7d96e1afaaa231d284bb6f
diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser
index 97ed0b35..03fbf21d 160000
--- a/thirdparty/idl-parser
+++ b/thirdparty/idl-parser
@@ -1 +1 @@
-Subproject commit 97ed0b3533abeff445c77ea9a976604fd25c8967
+Subproject commit 03fbf21d24ba42a70e558cb3ab2caa77fccf9fbe