diff --git a/cmake/testing/GoogleTest.cmake b/cmake/testing/GoogleTest.cmake
index b14299e28d6..30396f6b020 100644
--- a/cmake/testing/GoogleTest.cmake
+++ b/cmake/testing/GoogleTest.cmake
@@ -25,6 +25,6 @@ function(gtest_discover_tests TARGET)
 
         set(CMAKE_COMMAND "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_win_wrapper_$<CONFIG>.bat")
     endif()
-    set(_DISCOVERY_TIMEOUT "DISCOVERY_TIMEOUT;10")
+    set(_DISCOVERY_TIMEOUT "DISCOVERY_TIMEOUT;30")
     _gtest_discover_tests(${TARGET} ${ARGN} ${_DISCOVERY_TIMEOUT})
 endfunction()
diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp
index 31fbc88626b..49e59580062 100644
--- a/include/fastdds/dds/domain/DomainParticipant.hpp
+++ b/include/fastdds/dds/domain/DomainParticipant.hpp
@@ -27,16 +27,15 @@
 
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp>
-#include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/dds/core/status/StatusMask.hpp>
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
+#include <fastdds/dds/core/status/StatusMask.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/topic/ContentFilteredTopic.hpp>
 #include <fastdds/dds/topic/IContentFilterFactory.hpp>
-#include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicListener.hpp>
+#include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/SampleIdentity.h>
diff --git a/include/fastdds/dds/domain/DomainParticipantFactory.hpp b/include/fastdds/dds/domain/DomainParticipantFactory.hpp
index 32d11d8b6bf..35bff830d90 100644
--- a/include/fastdds/dds/domain/DomainParticipantFactory.hpp
+++ b/include/fastdds/dds/domain/DomainParticipantFactory.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DOMAINPARTICIPANT_HPP_
-#define _FASTDDS_DOMAINPARTICIPANT_HPP_
+#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
+#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
 
 #include <map>
 #include <memory>
@@ -331,4 +331,4 @@ class DomainParticipantFactory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DOMAINPARTICIPANT_HPP_*/
+#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/
diff --git a/include/fastdds/dds/topic/IContentFilterFactory.hpp b/include/fastdds/dds/topic/IContentFilterFactory.hpp
index b2171d69181..c025662ab59 100644
--- a/include/fastdds/dds/topic/IContentFilterFactory.hpp
+++ b/include/fastdds/dds/topic/IContentFilterFactory.hpp
@@ -21,8 +21,8 @@
 
 #include <fastrtps/fastrtps_dll.h>
 
-#include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/core/LoanableTypedCollection.hpp>
+#include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/topic/IContentFilter.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastrtps/types/TypeDescriptor.h>
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
index 96ea5d1dba1..c5afb138d53 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
@@ -1451,53 +1451,6 @@ ReturnCode_t DomainParticipantImpl::register_type(
     return RETCODE_OK;
 }
 
-// TODO(XTypes): PENDING design to register discovered remote types
-// bool DomainParticipantImpl::register_dynamic_type_to_factories(
-//         const TypeSupport& type) const
-// {
-//     using namespace  eprosima::fastrtps::types;
-//     DynamicPubSubType* dpst = dynamic_cast<DynamicPubSubType*>(type.get());
-//     if (dpst != nullptr) // Registering a dynamic type.
-//     {
-//         TypeObjectFactory* objectFactory = TypeObjectFactory::get_instance();
-//         eprosima::fastrtps::types::DynamicTypeBuilderFactory* dynFactory =
-//                 eprosima::fastrtps::types::DynamicTypeBuilderFactory::get_instance();
-//         const TypeIdentifier* id = objectFactory->get_type_identifier_trying_complete(dpst->getName());
-//         if (id == nullptr)
-//         {
-//             std::map<MemberId, fastrtps::types::DynamicTypeMember*> membersMap;
-//             dpst->GetDynamicType()->get_all_members(membersMap);
-//             std::vector<const MemberDescriptor*> members;
-//             for (auto it : membersMap)
-//             {
-//                 members.push_back(it.second->get_descriptor());
-//             }
-//             TypeObject typeObj;
-//             dynFactory->build_type_object(dpst->GetDynamicType()->get_type_descriptor(), typeObj, &members);
-//             // Minimal too
-//             dynFactory->build_type_object(dpst->GetDynamicType()->get_type_descriptor(), typeObj, &members, false);
-//             const TypeIdentifier* type_id2 = objectFactory->get_type_identifier(dpst->getName());
-//             const TypeObject* type_obj = objectFactory->get_type_object(dpst->getName());
-//             if (type_id2 == nullptr)
-//             {
-//                 EPROSIMA_LOG_ERROR(DOMAIN_PARTICIPANT, "Cannot register dynamic type " << dpst->getName());
-//             }
-//             else
-//             {
-//                 objectFactory->add_type_object(dpst->getName(), type_id2, type_obj);
-
-//                 // Complete, just to make sure it is generated
-//                 const TypeIdentifier* type_id_complete = objectFactory->get_type_identifier(dpst->getName(), true);
-//                 const TypeObject* type_obj_complete = objectFactory->get_type_object(dpst->getName(), true);
-//                 objectFactory->add_type_object(dpst->getName(), type_id_complete, type_obj_complete); // Add complete
-//                 return true;
-//             }
-//         }
-//     }
-
-//     return false; // Isn't a registered dynamic type.
-// }
-
 ReturnCode_t DomainParticipantImpl::unregister_type(
         const std::string& type_name)
 {
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
index c344c233460..9d60cabfd45 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -661,10 +661,6 @@ class DomainParticipantImpl
     ReturnCode_t register_dynamic_type(
             fastrtps::types::DynamicType_ptr dyn_type);
 
-    // TODO(XTypes): PENDING design to register discovered remote types
-    //     bool register_dynamic_type_to_factories(
-    //             const TypeSupport& type) const;
-
     virtual PublisherImpl* create_publisher_impl(
             const PublisherQos& qos,
             PublisherListener* listener);
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp
index 2a1bf05bf9a..4bb26f1f996 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParserImpl/identifiers.hpp
@@ -154,12 +154,14 @@ struct identifier_processor
             case TI_STRING8_LARGE:
                 return DDSFilterValue::ValueKind::STRING;
 
+            case eprosima::fastdds::dds::xtypes::TK_INT8:
             case eprosima::fastdds::dds::xtypes::TK_INT16:
             case eprosima::fastdds::dds::xtypes::TK_INT32:
             case eprosima::fastdds::dds::xtypes::TK_INT64:
                 return DDSFilterValue::ValueKind::SIGNED_INTEGER;
 
             case eprosima::fastdds::dds::xtypes::TK_BYTE:
+            case eprosima::fastdds::dds::xtypes::TK_UINT8:
             case eprosima::fastdds::dds::xtypes::TK_UINT16:
             case eprosima::fastdds::dds::xtypes::TK_UINT32:
             case eprosima::fastdds::dds::xtypes::TK_UINT64:
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp
index 77b102b0c5c..eea23150f01 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp
@@ -530,37 +530,6 @@ ReturnCode_t DDSFilterFactory::create_content_filter(
             auto node = parser::parse_filter_expression(filter_expression, &type_object);
             if (node)
             {
-                eprosima::fastdds::dds::xtypes::TypeIdentifierPair type_ids;
-                eprosima::fastdds::dds::xtypes::TypeIdentifier type_id;
-                ret = DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
-                    type_name, type_ids);
-                if (eprosima::fastdds::dds::xtypes::TK_NONE == type_ids.type_identifier2()._d() ||
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE == type_ids.type_identifier1()._d() ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_SEQUENCE_SMALL == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().seq_sdefn().header().equiv_kind()) ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_SEQUENCE_LARGE == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().seq_ldefn().header().equiv_kind()) ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_ARRAY_SMALL == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().array_sdefn().header().equiv_kind()) ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_ARRAY_LARGE == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().array_ldefn().header().equiv_kind()) ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_MAP_SMALL == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().map_sdefn().header().equiv_kind()) ||
-                        (eprosima::fastdds::dds::xtypes::TI_PLAIN_MAP_LARGE == type_ids.type_identifier1()._d() &&
-                        eprosima::fastdds::dds::xtypes::EK_COMPLETE ==
-                        type_ids.type_identifier1().map_ldefn().header().equiv_kind()))
-                {
-                    type_id = type_ids.type_identifier1();
-                }
-                else
-                {
-                    type_id = type_ids.type_identifier2();
-                }
                 // TODO(XTypes): PENDING implementation DynamicTypeBuilderFactory::create_type_w_type_object
                 eprosima::fastrtps::types::DynamicType_ptr dyn_type; //= TypeObjectFactory::get_instance()->build_dynamic_type(type_name, type_id, type_object);
                 DDSFilterExpression* expr = get_expression();
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
index 7d5cb4f3e3d..cf60bcf4f66 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
@@ -128,6 +128,10 @@ bool DDSFilterField::set_value(
                 string_value = data->get_string_value(member_id);
                 break;
 
+            case eprosima::fastdds::dds::xtypes::TK_INT8:
+                signed_integer_value = data->get_int8_value(member_id);
+                break;
+
             case eprosima::fastdds::dds::xtypes::TK_INT16:
                 signed_integer_value = data->get_int16_value(member_id);
                 break;
@@ -141,6 +145,7 @@ bool DDSFilterField::set_value(
                 break;
 
             case eprosima::fastdds::dds::xtypes::TK_BYTE:
+            case eprosima::fastdds::dds::xtypes::TK_UINT8:
                 unsigned_integer_value = data->get_uint8_value(member_id);
                 break;
 
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
index 2ccb18f05a3..20e85700ca7 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
+#include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastrtps/types/DynamicData.h>
 
 #include "DDSFilterPredicate.hpp"
diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
index c8a807199bf..85cf783caff 100644
--- a/test/blackbox/api/dds-pim/PubSubReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -27,32 +27,32 @@
 #include <string>
 
 #include <asio.hpp>
-#include <gtest/gtest.h>
-#if _MSC_VER
-#include <Windows.h>
-#endif // _MSC_VER
-#include <fastdds/dds/core/condition/StatusCondition.hpp>
 #include <fastdds/dds/core/condition/GuardCondition.hpp>
+#include <fastdds/dds/core/condition/StatusCondition.hpp>
 #include <fastdds/dds/core/condition/WaitSet.hpp>
-#include <fastdds/dds/core/UserAllocatedSequence.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
+#include <fastdds/dds/core/UserAllocatedSequence.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
+#include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/rtps/transport/UDPTransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastrtps/utils/IPLocator.h>
 #include <fastrtps/xmlparser/XMLParser.h>
 #include <fastrtps/xmlparser/XMLTree.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <gtest/gtest.h>
+#if _MSC_VER
+#include <Windows.h>
+#endif // _MSC_VER
 
 using DomainParticipantFactory = eprosima::fastdds::dds::DomainParticipantFactory;
 using eprosima::fastrtps::rtps::IPLocator;
diff --git a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
index 2c386c31531..5f7ea28879c 100644
--- a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
+++ b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DOMAINPARTICIPANT_HPP_
-#define _FASTDDS_DOMAINPARTICIPANT_HPP_
+#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
+#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
 
 #include <memory>
 
@@ -66,4 +66,4 @@ class DomainParticipantFactory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DOMAINPARTICIPANT_HPP_*/
+#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/