diff --git a/fastdds_python/test/types/test_complete.i b/fastdds_python/test/types/test_complete.i
index 8b2dc09f..3177a07a 100644
--- a/fastdds_python/test/types/test_complete.i
+++ b/fastdds_python/test/types/test_complete.i
@@ -82,6 +82,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore StructType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -92,6 +93,7 @@ namespace swig {
 
 %ignore StructType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -102,6 +104,7 @@ namespace swig {
 
 %ignore StructType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -112,6 +115,7 @@ namespace swig {
 
 %ignore StructType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -122,6 +126,7 @@ namespace swig {
 
 %ignore StructType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -132,6 +137,7 @@ namespace swig {
 
 %ignore StructType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -142,6 +148,7 @@ namespace swig {
 
 %ignore StructType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -152,6 +159,7 @@ namespace swig {
 
 %ignore StructType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -162,6 +170,7 @@ namespace swig {
 
 %ignore StructType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -172,6 +181,7 @@ namespace swig {
 
 %ignore StructType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -182,6 +192,7 @@ namespace swig {
 
 %ignore StructType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -192,6 +203,7 @@ namespace swig {
 
 %ignore StructType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -202,6 +214,7 @@ namespace swig {
 
 %ignore StructType::enum_field(Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -212,6 +225,7 @@ namespace swig {
 
 %ignore StructType::enum2_field(Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -222,6 +236,7 @@ namespace swig {
 
 %ignore StructType::included_module_struct(eprosima::test2::StructType2&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -265,6 +280,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore CompleteTestType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -275,6 +291,7 @@ namespace swig {
 
 %ignore CompleteTestType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -285,6 +302,7 @@ namespace swig {
 
 %ignore CompleteTestType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -295,6 +313,7 @@ namespace swig {
 
 %ignore CompleteTestType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -305,6 +324,7 @@ namespace swig {
 
 %ignore CompleteTestType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -315,6 +335,7 @@ namespace swig {
 
 %ignore CompleteTestType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -325,6 +346,7 @@ namespace swig {
 
 %ignore CompleteTestType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -335,6 +357,7 @@ namespace swig {
 
 %ignore CompleteTestType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -345,6 +368,7 @@ namespace swig {
 
 %ignore CompleteTestType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -355,6 +379,7 @@ namespace swig {
 
 %ignore CompleteTestType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -365,6 +390,7 @@ namespace swig {
 
 %ignore CompleteTestType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -375,6 +401,7 @@ namespace swig {
 
 %ignore CompleteTestType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -385,6 +412,7 @@ namespace swig {
 
 %ignore CompleteTestType::enum_field(Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -395,6 +423,7 @@ namespace swig {
 
 %ignore CompleteTestType::enum2_field(Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -405,6 +434,7 @@ namespace swig {
 
 %ignore CompleteTestType::struct_field(StructType&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -413,6 +443,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::char_opt_field(char&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(charOpt) eprosima::fastcdr::optional<char>;
@@ -425,8 +458,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::char_opt_field(char&&);
+%ignore CompleteTestType::char_opt_field(eprosima::fastcdr::optional<char>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -436,6 +469,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::uint8_opt_field(uint8_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint8_tOpt) eprosima::fastcdr::optional<uint8_t>;
@@ -448,8 +484,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::uint8_opt_field(uint8_t&&);
+%ignore CompleteTestType::uint8_opt_field(eprosima::fastcdr::optional<uint8_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -459,6 +495,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::int16_opt_field(int16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int16_tOpt) eprosima::fastcdr::optional<int16_t>;
@@ -471,8 +510,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::int16_opt_field(int16_t&&);
+%ignore CompleteTestType::int16_opt_field(eprosima::fastcdr::optional<int16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -482,6 +521,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::uint16_opt_field(uint16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint16_tOpt) eprosima::fastcdr::optional<uint16_t>;
@@ -494,8 +536,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::uint16_opt_field(uint16_t&&);
+%ignore CompleteTestType::uint16_opt_field(eprosima::fastcdr::optional<uint16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -505,6 +547,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::int32_opt_field(int32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int32_tOpt) eprosima::fastcdr::optional<int32_t>;
@@ -517,8 +562,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::int32_opt_field(int32_t&&);
+%ignore CompleteTestType::int32_opt_field(eprosima::fastcdr::optional<int32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -528,6 +573,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::uint32_opt_field(uint32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint32_tOpt) eprosima::fastcdr::optional<uint32_t>;
@@ -540,8 +588,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::uint32_opt_field(uint32_t&&);
+%ignore CompleteTestType::uint32_opt_field(eprosima::fastcdr::optional<uint32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -551,6 +599,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::int64_opt_field(int64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int64_tOpt) eprosima::fastcdr::optional<int64_t>;
@@ -563,8 +614,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::int64_opt_field(int64_t&&);
+%ignore CompleteTestType::int64_opt_field(eprosima::fastcdr::optional<int64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -574,6 +625,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::uint64_opt_field(uint64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint64_tOpt) eprosima::fastcdr::optional<uint64_t>;
@@ -586,8 +640,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::uint64_opt_field(uint64_t&&);
+%ignore CompleteTestType::uint64_opt_field(eprosima::fastcdr::optional<uint64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -597,6 +651,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::float_opt_field(float&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(floatOpt) eprosima::fastcdr::optional<float>;
@@ -609,8 +666,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::float_opt_field(float&&);
+%ignore CompleteTestType::float_opt_field(eprosima::fastcdr::optional<float>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -620,6 +677,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::double_opt_field(double&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(doubleOpt) eprosima::fastcdr::optional<double>;
@@ -632,8 +692,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::double_opt_field(double&&);
+%ignore CompleteTestType::double_opt_field(eprosima::fastcdr::optional<double>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -643,6 +703,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::bool_opt_field(bool&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(boolOpt) eprosima::fastcdr::optional<bool>;
@@ -655,8 +718,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::bool_opt_field(bool&&);
+%ignore CompleteTestType::bool_opt_field(eprosima::fastcdr::optional<bool>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -666,6 +729,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::string_opt_field(std::string&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(stringOpt) eprosima::fastcdr::optional<std::string>;
@@ -678,8 +744,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::string_opt_field(std::string&&);
+%ignore CompleteTestType::string_opt_field(eprosima::fastcdr::optional<std::string>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -689,6 +755,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::enum_opt_field(Color&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(ColorOpt) eprosima::fastcdr::optional<Color>;
@@ -701,8 +770,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::enum_opt_field(Color&&);
+%ignore CompleteTestType::enum_opt_field(eprosima::fastcdr::optional<Color>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -712,6 +781,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::enum2_opt_field(Material&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(MaterialOpt) eprosima::fastcdr::optional<Material>;
@@ -724,8 +796,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::enum2_opt_field(Material&&);
+%ignore CompleteTestType::enum2_opt_field(eprosima::fastcdr::optional<Material>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -735,6 +807,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore CompleteTestType::struct_opt_field(StructType&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(StructTypeOpt) eprosima::fastcdr::optional<StructType>;
@@ -747,8 +822,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore CompleteTestType::struct_opt_field(StructType&&);
+%ignore CompleteTestType::struct_opt_field(eprosima::fastcdr::optional<StructType>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -760,6 +835,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_char_field(std::array<char, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -776,6 +852,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_uint8_field(std::array<uint8_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -792,6 +869,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_int16_field(std::array<int16_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -808,6 +886,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_uint16_field(std::array<uint16_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -824,6 +903,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_int32_field(std::array<int32_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -840,6 +920,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_uint32_field(std::array<uint32_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -856,6 +937,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_int64_field(std::array<int64_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -872,6 +954,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_uint64_field(std::array<uint64_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -888,6 +971,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_float_field(std::array<float, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -904,6 +988,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_double_field(std::array<double, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -920,6 +1005,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_bool_field(std::array<bool, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -936,6 +1022,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_enum_field(std::array<Color, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -952,6 +1039,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_enum2_field(std::array<Material, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -968,6 +1056,7 @@ namespace swig {
 
 %ignore CompleteTestType::array_struct_field(std::array<StructType, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -977,6 +1066,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -994,6 +1084,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1011,6 +1102,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1028,6 +1120,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1045,6 +1138,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1062,6 +1156,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1079,6 +1174,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1096,6 +1192,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1113,6 +1210,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1130,6 +1228,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1147,6 +1246,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1156,6 +1256,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_enum_field(std::vector<Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1173,6 +1274,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_enum2_field(std::vector<Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1190,6 +1292,7 @@ namespace swig {
 
 %ignore CompleteTestType::bounded_sequence_struct_field(std::vector<StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1199,6 +1302,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1216,6 +1320,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1233,6 +1338,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1250,6 +1356,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1267,6 +1374,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1284,6 +1392,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1301,6 +1410,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1318,6 +1428,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1335,6 +1446,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1352,6 +1464,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1369,6 +1482,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1378,6 +1492,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_enum_field(std::vector<Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1395,6 +1510,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_enum2_field(std::vector<Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1412,6 +1528,7 @@ namespace swig {
 
 %ignore CompleteTestType::unbounded_sequence_struct_field(std::vector<StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1450,6 +1567,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore KeyedCompleteTestType::id(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1460,6 +1578,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1470,6 +1589,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1480,6 +1600,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1490,6 +1611,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1500,6 +1622,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1510,6 +1633,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1520,6 +1644,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1530,6 +1655,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1540,6 +1666,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1550,6 +1677,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1560,6 +1688,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1570,6 +1699,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1580,6 +1710,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::enum_field(Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1590,6 +1721,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::enum2_field(Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1600,6 +1732,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::struct_field(StructType&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1608,6 +1741,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::char_opt_field(char&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(charOpt) eprosima::fastcdr::optional<char>;
@@ -1620,8 +1756,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::char_opt_field(char&&);
+%ignore KeyedCompleteTestType::char_opt_field(eprosima::fastcdr::optional<char>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1631,6 +1767,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::uint8_opt_field(uint8_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint8_tOpt) eprosima::fastcdr::optional<uint8_t>;
@@ -1643,8 +1782,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::uint8_opt_field(uint8_t&&);
+%ignore KeyedCompleteTestType::uint8_opt_field(eprosima::fastcdr::optional<uint8_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1654,6 +1793,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::int16_opt_field(int16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int16_tOpt) eprosima::fastcdr::optional<int16_t>;
@@ -1666,8 +1808,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::int16_opt_field(int16_t&&);
+%ignore KeyedCompleteTestType::int16_opt_field(eprosima::fastcdr::optional<int16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1677,6 +1819,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::uint16_opt_field(uint16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint16_tOpt) eprosima::fastcdr::optional<uint16_t>;
@@ -1689,8 +1834,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::uint16_opt_field(uint16_t&&);
+%ignore KeyedCompleteTestType::uint16_opt_field(eprosima::fastcdr::optional<uint16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1700,6 +1845,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::int32_opt_field(int32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int32_tOpt) eprosima::fastcdr::optional<int32_t>;
@@ -1712,8 +1860,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::int32_opt_field(int32_t&&);
+%ignore KeyedCompleteTestType::int32_opt_field(eprosima::fastcdr::optional<int32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1723,6 +1871,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::uint32_opt_field(uint32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint32_tOpt) eprosima::fastcdr::optional<uint32_t>;
@@ -1735,8 +1886,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::uint32_opt_field(uint32_t&&);
+%ignore KeyedCompleteTestType::uint32_opt_field(eprosima::fastcdr::optional<uint32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1746,6 +1897,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::int64_opt_field(int64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int64_tOpt) eprosima::fastcdr::optional<int64_t>;
@@ -1758,8 +1912,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::int64_opt_field(int64_t&&);
+%ignore KeyedCompleteTestType::int64_opt_field(eprosima::fastcdr::optional<int64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1769,6 +1923,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::uint64_opt_field(uint64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint64_tOpt) eprosima::fastcdr::optional<uint64_t>;
@@ -1781,8 +1938,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::uint64_opt_field(uint64_t&&);
+%ignore KeyedCompleteTestType::uint64_opt_field(eprosima::fastcdr::optional<uint64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1792,6 +1949,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::float_opt_field(float&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(floatOpt) eprosima::fastcdr::optional<float>;
@@ -1804,8 +1964,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::float_opt_field(float&&);
+%ignore KeyedCompleteTestType::float_opt_field(eprosima::fastcdr::optional<float>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1815,6 +1975,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::double_opt_field(double&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(doubleOpt) eprosima::fastcdr::optional<double>;
@@ -1827,8 +1990,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::double_opt_field(double&&);
+%ignore KeyedCompleteTestType::double_opt_field(eprosima::fastcdr::optional<double>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1838,6 +2001,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::bool_opt_field(bool&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(boolOpt) eprosima::fastcdr::optional<bool>;
@@ -1850,8 +2016,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::bool_opt_field(bool&&);
+%ignore KeyedCompleteTestType::bool_opt_field(eprosima::fastcdr::optional<bool>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1861,6 +2027,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::string_opt_field(std::string&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(stringOpt) eprosima::fastcdr::optional<std::string>;
@@ -1873,8 +2042,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::string_opt_field(std::string&&);
+%ignore KeyedCompleteTestType::string_opt_field(eprosima::fastcdr::optional<std::string>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1884,6 +2053,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::enum_opt_field(Color&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(ColorOpt) eprosima::fastcdr::optional<Color>;
@@ -1896,8 +2068,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::enum_opt_field(Color&&);
+%ignore KeyedCompleteTestType::enum_opt_field(eprosima::fastcdr::optional<Color>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1907,6 +2079,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::enum2_opt_field(Material&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(MaterialOpt) eprosima::fastcdr::optional<Material>;
@@ -1919,8 +2094,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::enum2_opt_field(Material&&);
+%ignore KeyedCompleteTestType::enum2_opt_field(eprosima::fastcdr::optional<Material>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1930,6 +2105,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore KeyedCompleteTestType::struct_opt_field(StructType&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(StructTypeOpt) eprosima::fastcdr::optional<StructType>;
@@ -1942,8 +2120,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore KeyedCompleteTestType::struct_opt_field(StructType&&);
+%ignore KeyedCompleteTestType::struct_opt_field(eprosima::fastcdr::optional<StructType>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1955,6 +2133,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_char_field(std::array<char, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1971,6 +2150,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_uint8_field(std::array<uint8_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1987,6 +2167,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_int16_field(std::array<int16_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2003,6 +2184,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_uint16_field(std::array<uint16_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2019,6 +2201,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_int32_field(std::array<int32_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2035,6 +2218,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_uint32_field(std::array<uint32_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2051,6 +2235,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_int64_field(std::array<int64_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2067,6 +2252,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_uint64_field(std::array<uint64_t, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2083,6 +2269,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_float_field(std::array<float, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2099,6 +2286,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_double_field(std::array<double, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2115,6 +2303,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_bool_field(std::array<bool, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2131,6 +2320,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_enum_field(std::array<Color, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2147,6 +2337,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_enum2_field(std::array<Material, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2163,6 +2354,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::array_struct_field(std::array<StructType, max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2172,6 +2364,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2189,6 +2382,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2206,6 +2400,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2223,6 +2418,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2240,6 +2436,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2257,6 +2454,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2274,6 +2472,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2291,6 +2490,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2308,6 +2508,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2325,6 +2526,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2342,6 +2544,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2351,6 +2554,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_enum_field(std::vector<Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2368,6 +2572,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_enum2_field(std::vector<Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2385,6 +2590,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::bounded_sequence_struct_field(std::vector<StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2394,6 +2600,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2411,6 +2618,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2428,6 +2636,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2445,6 +2654,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2462,6 +2672,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2479,6 +2690,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2496,6 +2708,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2513,6 +2726,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2530,6 +2744,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2547,6 +2762,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2564,6 +2780,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2573,6 +2790,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_enum_field(std::vector<Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2590,6 +2808,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_enum2_field(std::vector<Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2607,6 +2826,7 @@ namespace swig {
 
 %ignore KeyedCompleteTestType::unbounded_sequence_struct_field(std::vector<StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
diff --git a/fastdds_python/test/types/test_included_modules.i b/fastdds_python/test/types/test_included_modules.i
index 1de154b2..58af7980 100644
--- a/fastdds_python/test/types/test_included_modules.i
+++ b/fastdds_python/test/types/test_included_modules.i
@@ -81,6 +81,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore eprosima::test2::StructType2::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -91,6 +92,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -101,6 +103,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -111,6 +114,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -121,6 +125,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -131,6 +136,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -141,6 +147,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -151,6 +158,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -161,6 +169,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -171,6 +180,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -181,6 +191,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -191,6 +202,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -201,6 +213,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::enum_field(eprosima::test2::Color2&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -211,6 +224,7 @@ namespace swig {
 
 %ignore eprosima::test2::StructType2::enum2_field(eprosima::test2::Material2&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
diff --git a/fastdds_python/test/types/test_modules.i b/fastdds_python/test/types/test_modules.i
index e657eb75..b70f60eb 100644
--- a/fastdds_python/test/types/test_modules.i
+++ b/fastdds_python/test/types/test_modules.i
@@ -81,6 +81,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore eprosima::test::StructType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -91,6 +92,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -101,6 +103,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -111,6 +114,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -121,6 +125,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -131,6 +136,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -141,6 +147,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -151,6 +158,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -161,6 +169,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -171,6 +180,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -181,6 +191,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -191,6 +202,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -201,6 +213,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::enum_field(eprosima::test::Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -211,6 +224,7 @@ namespace swig {
 
 %ignore eprosima::test::StructType::enum2_field(eprosima::test::Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -254,6 +268,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore eprosima::test::CompleteTestType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -264,6 +279,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -274,6 +290,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -284,6 +301,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -294,6 +312,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -304,6 +323,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -314,6 +334,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -324,6 +345,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -334,6 +356,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -344,6 +367,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -354,6 +378,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -364,6 +389,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -374,6 +400,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::enum_field(eprosima::test::Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -384,6 +411,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::enum2_field(eprosima::test::Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -394,6 +422,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::struct_field(eprosima::test::StructType&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -402,6 +431,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::char_opt_field(char&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(charOpt) eprosima::fastcdr::optional<char>;
@@ -414,8 +446,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::char_opt_field(char&&);
+%ignore eprosima::test::CompleteTestType::char_opt_field(eprosima::fastcdr::optional<char>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -425,6 +457,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::uint8_opt_field(uint8_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint8_tOpt) eprosima::fastcdr::optional<uint8_t>;
@@ -437,8 +472,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::uint8_opt_field(uint8_t&&);
+%ignore eprosima::test::CompleteTestType::uint8_opt_field(eprosima::fastcdr::optional<uint8_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -448,6 +483,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::int16_opt_field(int16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int16_tOpt) eprosima::fastcdr::optional<int16_t>;
@@ -460,8 +498,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::int16_opt_field(int16_t&&);
+%ignore eprosima::test::CompleteTestType::int16_opt_field(eprosima::fastcdr::optional<int16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -471,6 +509,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::uint16_opt_field(uint16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint16_tOpt) eprosima::fastcdr::optional<uint16_t>;
@@ -483,8 +524,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::uint16_opt_field(uint16_t&&);
+%ignore eprosima::test::CompleteTestType::uint16_opt_field(eprosima::fastcdr::optional<uint16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -494,6 +535,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::int32_opt_field(int32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int32_tOpt) eprosima::fastcdr::optional<int32_t>;
@@ -506,8 +550,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::int32_opt_field(int32_t&&);
+%ignore eprosima::test::CompleteTestType::int32_opt_field(eprosima::fastcdr::optional<int32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -517,6 +561,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::uint32_opt_field(uint32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint32_tOpt) eprosima::fastcdr::optional<uint32_t>;
@@ -529,8 +576,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::uint32_opt_field(uint32_t&&);
+%ignore eprosima::test::CompleteTestType::uint32_opt_field(eprosima::fastcdr::optional<uint32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -540,6 +587,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::int64_opt_field(int64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int64_tOpt) eprosima::fastcdr::optional<int64_t>;
@@ -552,8 +602,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::int64_opt_field(int64_t&&);
+%ignore eprosima::test::CompleteTestType::int64_opt_field(eprosima::fastcdr::optional<int64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -563,6 +613,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::uint64_opt_field(uint64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint64_tOpt) eprosima::fastcdr::optional<uint64_t>;
@@ -575,8 +628,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::uint64_opt_field(uint64_t&&);
+%ignore eprosima::test::CompleteTestType::uint64_opt_field(eprosima::fastcdr::optional<uint64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -586,6 +639,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::float_opt_field(float&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(floatOpt) eprosima::fastcdr::optional<float>;
@@ -598,8 +654,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::float_opt_field(float&&);
+%ignore eprosima::test::CompleteTestType::float_opt_field(eprosima::fastcdr::optional<float>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -609,6 +665,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::double_opt_field(double&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(doubleOpt) eprosima::fastcdr::optional<double>;
@@ -621,8 +680,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::double_opt_field(double&&);
+%ignore eprosima::test::CompleteTestType::double_opt_field(eprosima::fastcdr::optional<double>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -632,6 +691,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::bool_opt_field(bool&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(boolOpt) eprosima::fastcdr::optional<bool>;
@@ -644,8 +706,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::bool_opt_field(bool&&);
+%ignore eprosima::test::CompleteTestType::bool_opt_field(eprosima::fastcdr::optional<bool>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -655,6 +717,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::string_opt_field(std::string&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(stringOpt) eprosima::fastcdr::optional<std::string>;
@@ -667,8 +732,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::string_opt_field(std::string&&);
+%ignore eprosima::test::CompleteTestType::string_opt_field(eprosima::fastcdr::optional<std::string>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -678,6 +743,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::enum_opt_field(eprosima::test::Color&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(ColorOpt) eprosima::fastcdr::optional<eprosima::test::Color>;
@@ -690,8 +758,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::enum_opt_field(eprosima::test::Color&&);
+%ignore eprosima::test::CompleteTestType::enum_opt_field(eprosima::fastcdr::optional<eprosima::test::Color>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -701,6 +769,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::enum2_opt_field(eprosima::test::Material&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(MaterialOpt) eprosima::fastcdr::optional<eprosima::test::Material>;
@@ -713,8 +784,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::enum2_opt_field(eprosima::test::Material&&);
+%ignore eprosima::test::CompleteTestType::enum2_opt_field(eprosima::fastcdr::optional<eprosima::test::Material>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -724,6 +795,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::CompleteTestType::struct_opt_field(eprosima::test::StructType&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(StructTypeOpt) eprosima::fastcdr::optional<eprosima::test::StructType>;
@@ -736,8 +810,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::CompleteTestType::struct_opt_field(eprosima::test::StructType&&);
+%ignore eprosima::test::CompleteTestType::struct_opt_field(eprosima::fastcdr::optional<eprosima::test::StructType>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -749,6 +823,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_char_field(std::array<char, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -765,6 +840,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_uint8_field(std::array<uint8_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -781,6 +857,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_int16_field(std::array<int16_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -797,6 +874,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_uint16_field(std::array<uint16_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -813,6 +891,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_int32_field(std::array<int32_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -829,6 +908,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_uint32_field(std::array<uint32_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -845,6 +925,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_int64_field(std::array<int64_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -861,6 +942,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_uint64_field(std::array<uint64_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -877,6 +959,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_float_field(std::array<float, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -893,6 +976,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_double_field(std::array<double, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -909,6 +993,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_bool_field(std::array<bool, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -925,6 +1010,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_enum_field(std::array<eprosima::test::Color, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -941,6 +1027,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_enum2_field(std::array<eprosima::test::Material, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -957,6 +1044,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::array_struct_field(std::array<eprosima::test::StructType, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -966,6 +1054,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -983,6 +1072,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1000,6 +1090,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1017,6 +1108,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1034,6 +1126,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1051,6 +1144,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1068,6 +1162,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1085,6 +1180,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1102,6 +1198,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1119,6 +1216,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1136,6 +1234,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1145,6 +1244,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_enum_field(std::vector<eprosima::test::Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1162,6 +1262,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_enum2_field(std::vector<eprosima::test::Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1179,6 +1280,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::bounded_sequence_struct_field(std::vector<eprosima::test::StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1188,6 +1290,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1205,6 +1308,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1222,6 +1326,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1239,6 +1344,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1256,6 +1362,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1273,6 +1380,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1290,6 +1398,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1307,6 +1416,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1324,6 +1434,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1341,6 +1452,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1358,6 +1470,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1367,6 +1480,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_enum_field(std::vector<eprosima::test::Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1384,6 +1498,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_enum2_field(std::vector<eprosima::test::Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1401,6 +1516,7 @@ namespace swig {
 
 %ignore eprosima::test::CompleteTestType::unbounded_sequence_struct_field(std::vector<eprosima::test::StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1439,6 +1555,7 @@ namespace swig {
 // Avoid a warning ignoring all but one
 %ignore eprosima::test::KeyedCompleteTestType::id(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1449,6 +1566,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::char_field(char&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1459,6 +1577,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::uint8_field(uint8_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1469,6 +1588,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::int16_field(int16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1479,6 +1599,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::uint16_field(uint16_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1489,6 +1610,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::int32_field(int32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1499,6 +1621,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::uint32_field(uint32_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1509,6 +1632,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::int64_field(int64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1519,6 +1643,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::uint64_field(uint64_t&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1529,6 +1654,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::float_field(float&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1539,6 +1665,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::double_field(double&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1549,6 +1676,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bool_field(bool&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1559,6 +1687,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::string_field(std::string&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1569,6 +1698,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::enum_field(eprosima::test::Color&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1579,6 +1709,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::enum2_field(eprosima::test::Material&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1589,6 +1720,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::struct_field(eprosima::test::StructType&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1597,6 +1729,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::char_opt_field(char&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(charOpt) eprosima::fastcdr::optional<char>;
@@ -1609,8 +1744,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::char_opt_field(char&&);
+%ignore eprosima::test::KeyedCompleteTestType::char_opt_field(eprosima::fastcdr::optional<char>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1620,6 +1755,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::uint8_opt_field(uint8_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint8_tOpt) eprosima::fastcdr::optional<uint8_t>;
@@ -1632,8 +1770,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::uint8_opt_field(uint8_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::uint8_opt_field(eprosima::fastcdr::optional<uint8_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1643,6 +1781,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::int16_opt_field(int16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int16_tOpt) eprosima::fastcdr::optional<int16_t>;
@@ -1655,8 +1796,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::int16_opt_field(int16_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::int16_opt_field(eprosima::fastcdr::optional<int16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1666,6 +1807,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::uint16_opt_field(uint16_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint16_tOpt) eprosima::fastcdr::optional<uint16_t>;
@@ -1678,8 +1822,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::uint16_opt_field(uint16_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::uint16_opt_field(eprosima::fastcdr::optional<uint16_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1689,6 +1833,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::int32_opt_field(int32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int32_tOpt) eprosima::fastcdr::optional<int32_t>;
@@ -1701,8 +1848,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::int32_opt_field(int32_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::int32_opt_field(eprosima::fastcdr::optional<int32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1712,6 +1859,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::uint32_opt_field(uint32_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint32_tOpt) eprosima::fastcdr::optional<uint32_t>;
@@ -1724,8 +1874,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::uint32_opt_field(uint32_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::uint32_opt_field(eprosima::fastcdr::optional<uint32_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1735,6 +1885,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::int64_opt_field(int64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(int64_tOpt) eprosima::fastcdr::optional<int64_t>;
@@ -1747,8 +1900,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::int64_opt_field(int64_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::int64_opt_field(eprosima::fastcdr::optional<int64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1758,6 +1911,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::uint64_opt_field(uint64_t&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(uint64_tOpt) eprosima::fastcdr::optional<uint64_t>;
@@ -1770,8 +1926,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::uint64_opt_field(uint64_t&&);
+%ignore eprosima::test::KeyedCompleteTestType::uint64_opt_field(eprosima::fastcdr::optional<uint64_t>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1781,6 +1937,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::float_opt_field(float&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(floatOpt) eprosima::fastcdr::optional<float>;
@@ -1793,8 +1952,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::float_opt_field(float&&);
+%ignore eprosima::test::KeyedCompleteTestType::float_opt_field(eprosima::fastcdr::optional<float>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1804,6 +1963,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::double_opt_field(double&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(doubleOpt) eprosima::fastcdr::optional<double>;
@@ -1816,8 +1978,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::double_opt_field(double&&);
+%ignore eprosima::test::KeyedCompleteTestType::double_opt_field(eprosima::fastcdr::optional<double>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1827,6 +1989,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::bool_opt_field(bool&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(boolOpt) eprosima::fastcdr::optional<bool>;
@@ -1839,8 +2004,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::bool_opt_field(bool&&);
+%ignore eprosima::test::KeyedCompleteTestType::bool_opt_field(eprosima::fastcdr::optional<bool>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1850,6 +2015,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::string_opt_field(std::string&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(stringOpt) eprosima::fastcdr::optional<std::string>;
@@ -1862,8 +2030,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::string_opt_field(std::string&&);
+%ignore eprosima::test::KeyedCompleteTestType::string_opt_field(eprosima::fastcdr::optional<std::string>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1873,6 +2041,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::enum_opt_field(eprosima::test::Color&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(ColorOpt) eprosima::fastcdr::optional<eprosima::test::Color>;
@@ -1885,8 +2056,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::enum_opt_field(eprosima::test::Color&&);
+%ignore eprosima::test::KeyedCompleteTestType::enum_opt_field(eprosima::fastcdr::optional<eprosima::test::Color>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1896,6 +2067,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::enum2_opt_field(eprosima::test::Material&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(MaterialOpt) eprosima::fastcdr::optional<eprosima::test::Material>;
@@ -1908,8 +2082,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::enum2_opt_field(eprosima::test::Material&&);
+%ignore eprosima::test::KeyedCompleteTestType::enum2_opt_field(eprosima::fastcdr::optional<eprosima::test::Material>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1919,6 +2093,9 @@ namespace swig {
 
 
 
+#if FASTCDR_VERSION_MAJOR == 1
+%ignore eprosima::test::KeyedCompleteTestType::struct_opt_field(eprosima::test::StructType&&);
+#else
 %ignore eprosima::fastcdr::optional::value;
 %ignore eprosima::fastcdr::optional::reset;
 %template(StructTypeOpt) eprosima::fastcdr::optional<eprosima::test::StructType>;
@@ -1931,8 +2108,8 @@ namespace swig {
       *$self = value;
   }
 }
-
-%ignore eprosima::test::KeyedCompleteTestType::struct_opt_field(eprosima::test::StructType&&);
+%ignore eprosima::test::KeyedCompleteTestType::struct_opt_field(eprosima::fastcdr::optional<eprosima::test::StructType>&&);
+#endif
 
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
@@ -1944,6 +2121,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_char_field(std::array<char, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1960,6 +2138,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_uint8_field(std::array<uint8_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1976,6 +2155,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_int16_field(std::array<int16_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -1992,6 +2172,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_uint16_field(std::array<uint16_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2008,6 +2189,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_int32_field(std::array<int32_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2024,6 +2206,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_uint32_field(std::array<uint32_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2040,6 +2223,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_int64_field(std::array<int64_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2056,6 +2240,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_uint64_field(std::array<uint64_t, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2072,6 +2257,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_float_field(std::array<float, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2088,6 +2274,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_double_field(std::array<double, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2104,6 +2291,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_bool_field(std::array<bool, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2120,6 +2308,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_enum_field(std::array<eprosima::test::Color, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2136,6 +2325,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_enum2_field(std::array<eprosima::test::Material, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2152,6 +2342,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::array_struct_field(std::array<eprosima::test::StructType, eprosima::test::max_array_size>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2161,6 +2352,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2178,6 +2370,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2195,6 +2388,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2212,6 +2406,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2229,6 +2424,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2246,6 +2442,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2263,6 +2460,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2280,6 +2478,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2297,6 +2496,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2314,6 +2514,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2331,6 +2532,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2340,6 +2542,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_enum_field(std::vector<eprosima::test::Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2357,6 +2560,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_enum2_field(std::vector<eprosima::test::Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2374,6 +2578,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::bounded_sequence_struct_field(std::vector<eprosima::test::StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2383,6 +2588,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_char_field(std::vector<char>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2400,6 +2606,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_uint8_field(std::vector<uint8_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2417,6 +2624,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_int16_field(std::vector<int16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2434,6 +2642,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_uint16_field(std::vector<uint16_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2451,6 +2660,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_int32_field(std::vector<int32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2468,6 +2678,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_uint32_field(std::vector<uint32_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2485,6 +2696,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_int64_field(std::vector<int64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2502,6 +2714,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_uint64_field(std::vector<uint64_t>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2519,6 +2732,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_float_field(std::vector<float>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2536,6 +2750,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_double_field(std::vector<double>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2553,6 +2768,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_bool_field(std::vector<bool>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2562,6 +2778,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_enum_field(std::vector<eprosima::test::Color>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2579,6 +2796,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_enum2_field(std::vector<eprosima::test::Material>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
@@ -2596,6 +2814,7 @@ namespace swig {
 
 %ignore eprosima::test::KeyedCompleteTestType::unbounded_sequence_struct_field(std::vector<eprosima::test::StructType>&&);
 
+
 // Overloaded getter methods shadow each other and are equivalent in python
 // Const accesors produced constant enums instead of arrays/dictionaries when used
 // We ignore them to prevent this
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorld.cxx b/fastdds_python_examples/HelloWorldExample/HelloWorld.cxx
index 4b415d67..502f3953 100644
--- a/fastdds_python_examples/HelloWorldExample/HelloWorld.cxx
+++ b/fastdds_python_examples/HelloWorldExample/HelloWorld.cxx
@@ -30,6 +30,8 @@ char dummy;
 
 #if FASTCDR_VERSION_MAJOR > 1
 
+#include "HelloWorldTypeObject.h"
+
 #include <fastcdr/Cdr.h>
 
 
@@ -43,6 +45,8 @@ using namespace eprosima::fastcdr::exception;
 
 HelloWorld::HelloWorld()
 {
+    // Just to register all known types
+    registerHelloWorldTypes();
 }
 
 HelloWorld::~HelloWorld()
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldv1.cxx b/fastdds_python_examples/HelloWorldExample/HelloWorldv1.cxx
index 90e82ea8..bb049241 100644
--- a/fastdds_python_examples/HelloWorldExample/HelloWorldv1.cxx
+++ b/fastdds_python_examples/HelloWorldExample/HelloWorldv1.cxx
@@ -30,6 +30,8 @@ char dummy;
 
 #if FASTCDR_VERSION_MAJOR == 1
 
+#include "HelloWorldTypeObject.h"
+
 #include <fastcdr/Cdr.h>
 
 
@@ -95,6 +97,8 @@ HelloWorld::HelloWorld()
     // /type_d() m_message
 
 
+    // Just to register all known types
+    registerHelloWorldTypes();
 }
 
 HelloWorld::~HelloWorld()