diff --git a/common/dds-model.cpp b/common/dds-model.cpp
index 261d235d40..688c584adf 100644
--- a/common/dds-model.cpp
+++ b/common/dds-model.cpp
@@ -1,7 +1,7 @@
-#include "dds-model.h"
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2024 Intel Corporation. All Rights Reserved.
 
+#include "dds-model.h"
 #include "device-model.h"
 #include "ux-window.h"
 #include <rsutils/json.h>
@@ -13,67 +13,73 @@
 
 using namespace rs2;
 using rsutils::json;
+using rsutils::type::ip_address;
 
-dds_model::dds_model(rs2::device dev)
-    : _device(dev), _window_open(false)
+dds_model::dds_model( rs2::device dev )
+    : _device( dev )
+    , _window_open( false )
 {
-    if (supports_DDS()) {
-        _defult_config = get_eth_config(_device, DEFULT_VALUES);
-        _current_config = get_eth_config(_device, ACTUAL_VALUES);
+    if(check_DDS_support() )
+    {
+        _defult_config = get_eth_config( _device, DEFULT_VALUES );
+        _current_config = get_eth_config( _device, ACTUAL_VALUES );
         _changed_config = _current_config;
+        _dds_suported = true;
     }
-
 }
 
-eth_config dds_model::get_eth_config(rs2::debug_protocol dev, bool defult_val)
+eth_config dds_model::get_eth_config( rs2::debug_protocol dev, bool defult_val )
 {
-    auto cmd = dev.build_command(GET_ETH_CONFIG, defult_val ? 0 : 1);
-    auto data = dev.send_and_receive_raw_data(cmd);
-    int32_t const& code = *reinterpret_cast<int32_t const*>(data.data());
-    data.erase(data.begin(), data.begin() + sizeof(code));
-    return eth_config(data);
+    auto cmd = dev.build_command( GET_ETH_CONFIG, defult_val ? 0 : 1 );
+    auto data = dev.send_and_receive_raw_data( cmd );
+    int32_t const & code = *reinterpret_cast< int32_t const * >( data.data() );
+    data.erase( data.begin(), data.begin() + sizeof( code ) );
+    return eth_config( data );
 }
 
-void rs2::dds_model::set_eth_config(eth_config &new_config , std::string& error_message)
+void rs2::dds_model::set_eth_config( eth_config & new_config, std::string & error_message )
 {
-    rs2::debug_protocol hwm(_device);
-    auto cmd = hwm.build_command(SET_ETH_CONFIG, 0, 0, 0, 0, new_config.build_command());
-    auto data = hwm.send_and_receive_raw_data(cmd);
-    int32_t const& code = *reinterpret_cast<int32_t const*>(data.data());
-    if (data.size() != sizeof(code)) {
-        error_message = rsutils::string::from()<< "Failed to change: bad response size " << data.size() << ' '<< rsutils::string::hexdump(data.data(), data.size());
+    rs2::debug_protocol hwm( _device );
+    auto cmd = hwm.build_command( SET_ETH_CONFIG, 0, 0, 0, 0, new_config.build_command() );
+    auto data = hwm.send_and_receive_raw_data( cmd );
+    int32_t const & code = *reinterpret_cast< int32_t const * >( data.data() );
+    if( data.size() != sizeof( code ) )
+    {
+        error_message = rsutils::string::from() << "Failed to change: bad response size " << data.size() << ' '
+                                                << rsutils::string::hexdump( data.data(), data.size() );
         close_window();
     }
-    if (code != SET_ETH_CONFIG) {
+    if( code != SET_ETH_CONFIG )
+    {
         error_message = rsutils::string::from() << "Failed to change: bad response " << code;
         close_window();
     }
-    if (!_no_reset)
+    if( ! _no_reset )
     {
         close_window();
         _device.hardware_reset();
     }
 }
 
-void rs2::dds_model::enable_dds(std::string& error_message)
+void rs2::dds_model::enable_dds( std::string & error_message )
 {
-    if (_device.get_type() == "DDS")
+    if( _device.get_type() == "DDS" )
     {
         auto const filename
-            = rsutils::os::get_special_folder(rsutils::os::special_folder::app_data) + RS2_CONFIG_FILENAME;
-        auto config = rsutils::json_config::load_from_file(filename);
+            = rsutils::os::get_special_folder( rsutils::os::special_folder::app_data ) + RS2_CONFIG_FILENAME;
+        auto config = rsutils::json_config::load_from_file( filename );
 
         bool enabled;
-        if (!config.nested("context", "dds", "enabled").get_ex(enabled))
+        if( ! config.nested( "context", "dds", "enabled" ).get_ex( enabled ) )
         {
             config["context"]["dds"]["enabled"] = true;
             try
             {
-                std::ofstream out(filename);
-                out << std::setw(2) << config;
+                std::ofstream out( filename );
+                out << std::setw( 2 ) << config;
                 out.close();
             }
-            catch (std::exception const& e)
+            catch( std::exception const & e )
             {
                 error_message = e.what();
                 close_window();
@@ -82,60 +88,69 @@ void rs2::dds_model::enable_dds(std::string& error_message)
     }
 }
 
-priority rs2::dds_model::classifyPriority(link_priority &pr)
+bool rs2::dds_model::supports_DDS()
 {
-    if (pr == link_priority::usb_only || pr == link_priority::usb_first)
+    return _dds_suported;
+}
+
+priority rs2::dds_model::classifyPriority( link_priority & pr )
+{
+    if( pr == link_priority::usb_only || pr == link_priority::usb_first )
     {
         return priority::USB_FIRST;
     }
-    else if (pr == link_priority::eth_first || pr == link_priority::eth_only)
+    else if( pr == link_priority::eth_first || pr == link_priority::eth_only )
     {
         return priority::ETH_FIRST;
     }
     return priority::DYNAMIC;
 }
 
-bool dds_model::supports_DDS()
+bool dds_model::check_DDS_support()
 {
-    auto dev = debug_protocol(_device);
-    auto cmd = dev.build_command(GET_ETH_CONFIG , ACTUAL_VALUES );
-    auto data = dev.send_and_receive_raw_data(cmd);
-    int32_t const& code = *reinterpret_cast<int32_t const*>(data.data());
-    if (code != GET_ETH_CONFIG)
+    auto dev = debug_protocol( _device );
+    auto cmd = dev.build_command( GET_ETH_CONFIG, ACTUAL_VALUES );
+    auto data = dev.send_and_receive_raw_data( cmd );
+    int32_t const & code = *reinterpret_cast< int32_t const * >( data.data() );
+    if( code != GET_ETH_CONFIG )
         return false;
     return true;
 }
 
-void rs2::dds_model::ipInputText(std::string label ,rsutils::type::ip_address &ip)
+void rs2::dds_model::ipInputText( std::string label, ip_address & ip )
 {
     char buffer[16];
     std::string ip_str = ip.to_string();
-    std::snprintf(buffer, sizeof(buffer), "%s", ip_str.c_str());
+    std::snprintf( buffer, sizeof( buffer ), "%s", ip_str.c_str() );
     std::string label_name = "##" + label;
 
-    if (ImGui::InputText(label_name.c_str(), buffer, sizeof(buffer))) {
-        std::string new_ip_str(buffer);
-        if (rsutils::type::ip_address(new_ip_str).is_valid()) {
-            ip = rsutils::type::ip_address(new_ip_str);
+    if( ImGui::InputText( label_name.c_str(), buffer, sizeof( buffer ) ) )
+    {
+        std::string new_ip_str( buffer );
+        ip_address new_ip = ip_address( new_ip_str );
+        if( new_ip.is_valid() )
+        {
+            ip = new_ip;
         }
-        else {
-            std::snprintf(buffer, sizeof(buffer), "%s", ip.to_string().c_str());
+        else
+        {
+            std::snprintf( buffer, sizeof( buffer ), "%s", ip.to_string().c_str() );
         }
     }
 }
 
-void dds_model::render_dds_config_window(ux_window& window , std::string& error_message)
+void dds_model::render_dds_config_window( ux_window & window, std::string & error_message )
 {
     const auto window_name = "DDS Configuration";
-    if (_window_open)
+    if( _window_open )
     {
         try
         {
-            _current_config = get_eth_config(_device, ACTUAL_VALUES);
+            _current_config = get_eth_config( _device, ACTUAL_VALUES );
             _changed_config = _current_config;
-            ImGui::OpenPopup(window_name);
+            ImGui::OpenPopup( window_name );
         }
-        catch (std::exception e)
+        catch( std::exception e )
         {
             error_message = e.what();
         }
@@ -145,66 +160,71 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
     // Calculate window position and size
     const float w = 620;
     const float h = 500;
-    const float x0 = std::max(window.width() - w, 0.f) / 2;
-    const float y0 = std::max(window.height() - h, 0.f) / 2;
-    ImGui::SetNextWindowPos({ x0, y0 });
-    ImGui::SetNextWindowSize({ w, h });
-
-    auto flags = ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar |
-        ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings;
-
-    ImGui::PushStyleColor(ImGuiCol_PopupBg, sensor_bg);
-    ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_grey);
-    ImGui::PushStyleColor(ImGuiCol_Text, light_grey);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 1);
-    ImGui::PushStyleColor(ImGuiCol_Button, button_color);
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, button_color + 0.1f);
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, button_color + 0.1f);
-        
-
-    if (ImGui::BeginPopupModal(window_name, nullptr, flags))
+    const float x0 = std::max( window.width() - w, 0.f ) / 2;
+    const float y0 = std::max( window.height() - h, 0.f ) / 2;
+    ImGui::SetNextWindowPos( { x0, y0 } );
+    ImGui::SetNextWindowSize( { w, h } );
+
+    auto flags = ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse
+               | ImGuiWindowFlags_NoSavedSettings;
+
+    ImGui::PushStyleColor( ImGuiCol_PopupBg, sensor_bg );
+    ImGui::PushStyleColor( ImGuiCol_TextSelectedBg, light_grey );
+    ImGui::PushStyleColor( ImGuiCol_Text, light_grey );
+    ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 5, 5 ) );
+    ImGui::PushStyleVar( ImGuiStyleVar_WindowRounding, 1 );
+    ImGui::PushStyleColor( ImGuiCol_Button, button_color );
+    ImGui::PushStyleColor( ImGuiCol_ButtonHovered, button_color + 0.1f );
+    ImGui::PushStyleColor( ImGuiCol_ButtonActive, button_color + 0.1f );
+
+
+    if( ImGui::BeginPopupModal( window_name, nullptr, flags ) )
     {
-        if (error_message != "") ImGui::CloseCurrentPopup();
+        if( error_message != "" )
+            ImGui::CloseCurrentPopup();
 
         // Title
-        const char* title_message = window_name;
-        ImVec2 title_size = ImGui::CalcTextSize(title_message);
-        float title_x = (w - title_size.x - 10) / 2.0f;
-        ImGui::SetCursorPos({ title_x, 10.0f });
-        ImGui::PushFont(window.get_large_font());
-        ImGui::PushStyleColor(ImGuiCol_Text, white);
-        ImGui::Text("%s", title_message);
+        const char * title_message = window_name;
+        ImVec2 title_size = ImGui::CalcTextSize( title_message );
+        float title_x = ( w - title_size.x - 10 ) / 2.0f;
+        ImGui::SetCursorPos( { title_x, 10.0f } );
+        ImGui::PushFont( window.get_large_font() );
+        ImGui::PushStyleColor( ImGuiCol_Text, white );
+        ImGui::Text( "%s", title_message );
         ImGui::PopStyleColor();
         ImGui::PopFont();
         ImGui::Separator();
-        ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 15);
+        ImGui::SetCursorPosY( ImGui::GetCursorPosY() + 15 );
 
         // Version Display
-        ImGui::Text("Version: %s", RS2_API_FULL_VERSION_STR);
+        ImGui::Text( "Version: %s", RS2_API_FULL_VERSION_STR );
 
         // Main Scrollable Section
-        ImGui::BeginChild("MainContent", ImVec2(w - 10, h - 120), true);
-        ImGui::PushItemWidth(150.0f);
+        ImGui::BeginChild( "MainContent", ImVec2( w - 10, h - 120 ), true );
+        ImGui::PushItemWidth( 150.0f );
 
         // Connection Priority Section
-        priority connection_priority = classifyPriority(_changed_config.link.priority);
-        if (ImGui::CollapsingHeader("Connection Priority")) {
-            ImGui::Text("Select connection priority:");
-            ImGui::RadioButton("Ethernet First", reinterpret_cast<int*>(&connection_priority), 0);
-            if (static_cast<int>(connection_priority) == 0) {
+        priority connection_priority = classifyPriority( _changed_config.link.priority );
+        if( ImGui::CollapsingHeader( "Connection Priority" ) )
+        {
+            ImGui::Text( "Select connection priority:" );
+            ImGui::RadioButton( "Ethernet First", reinterpret_cast< int * >( &connection_priority ), 0 );
+            if( static_cast< int >( connection_priority ) == 0 )
+            {
                 ImGui::SameLine();
-                ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 50);
-                ImGui::Text("Link Timeout (seconds)");
+                ImGui::SetCursorPosX( ImGui::GetCursorPosX() + 50 );
+                ImGui::Text( "Link Timeout (seconds)" );
                 ImGui::SameLine();
-                int tempTimeout = static_cast<int>(_changed_config.link.timeout);
-                if (ImGui::InputInt("##Link Timeout (seconds)", &tempTimeout)) {
-                    _changed_config.link.timeout = static_cast<uint16_t>(std::max(0, tempTimeout));
+                int tempTimeout = static_cast< int >( _changed_config.link.timeout );
+                if( ImGui::InputInt( "##Link Timeout (seconds)", &tempTimeout ) )
+                {
+                    _changed_config.link.timeout = static_cast< uint16_t >( std::max( 0, tempTimeout ) );
                 }
             }
-            ImGui::RadioButton("USB First", reinterpret_cast<int*>(&connection_priority), 1);
-            ImGui::RadioButton("Dynamic Priority", reinterpret_cast<int*>(&connection_priority), 2);
-            switch (connection_priority) {
+            ImGui::RadioButton( "USB First", reinterpret_cast< int * >( &connection_priority ), 1 );
+            ImGui::RadioButton( "Dynamic Priority", reinterpret_cast< int * >( &connection_priority ), 2 );
+            switch( connection_priority )
+            {
             case ETH_FIRST:
                 _changed_config.link.priority = link_priority::eth_first;
                 break;
@@ -212,49 +232,55 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
                 _changed_config.link.priority = link_priority::usb_first;
                 break;
             case DYNAMIC:
-                _changed_config.link.priority = _current_config.link.speed ? link_priority::dynamic_eth_first : link_priority::dynamic_usb_first;
+                _changed_config.link.priority
+                    = _current_config.link.speed ? link_priority::dynamic_eth_first : link_priority::dynamic_usb_first;
                 break;
             }
         }
 
         // Network Configuration Section
-        if (ImGui::CollapsingHeader("Network Configuration")) {
-            ImGui::Checkbox("Enable DHCP", &_changed_config.dhcp.on);
-            if (!_changed_config.dhcp.on) {
-                ImGui::Text("Static IP Address");
+        if( ImGui::CollapsingHeader( "Network Configuration" ) )
+        {
+            ImGui::Checkbox( "Enable DHCP", &_changed_config.dhcp.on );
+            if( ! _changed_config.dhcp.on )
+            {
+                ImGui::Text( "Static IP Address" );
                 ImGui::SameLine();
                 float textbox_align = ImGui::GetCursorPosX();
-                ipInputText("Static IP Address", _changed_config.configured.ip);
-                ImGui::Text("Subnet Mask");
+                ipInputText( "Static IP Address", _changed_config.configured.ip );
+                ImGui::Text( "Subnet Mask" );
                 ImGui::SameLine();
-                ImGui::SetCursorPosX(textbox_align);
+                ImGui::SetCursorPosX( textbox_align );
                 bool maskStylePushed = false;
-                ipInputText("Subnet Mask", _changed_config.configured.netmask);
-                ImGui::Text("Gateway");
+                ipInputText( "Subnet Mask", _changed_config.configured.netmask );
+                ImGui::Text( "Gateway" );
                 ImGui::SameLine();
-                ImGui::SetCursorPosX(textbox_align);
-                ipInputText("Gateway", _changed_config.configured.gateway);
+                ImGui::SetCursorPosX( textbox_align );
+                ipInputText( "Gateway", _changed_config.configured.gateway );
             }
-            ImGui::Text("DHCP Timeout (seconds)");
+            ImGui::Text( "DHCP Timeout (seconds)" );
             ImGui::SameLine();
-            int tempTimeout = static_cast<int>(_changed_config.dhcp.timeout);
-            if (ImGui::InputInt("##DHCP Timeout (seconds)", &tempTimeout)) {
-                _changed_config.dhcp.timeout = static_cast<uint16_t>(std::max(0, tempTimeout));
+            int tempTimeout = static_cast< int >( _changed_config.dhcp.timeout );
+            if( ImGui::InputInt( "##DHCP Timeout (seconds)", &tempTimeout ) )
+            {
+                _changed_config.dhcp.timeout = static_cast< uint16_t >( std::max( 0, tempTimeout ) );
             }
         }
 
-        ImGui::Text("Domain ID");
+        ImGui::Text( "Domain ID" );
         ImGui::SameLine();
-        if (ImGui::InputInt("##Domain ID", &_changed_config.dds.domain_id)) {
-            if (_changed_config.dds.domain_id < 0)
+        if( ImGui::InputInt( "##Domain ID", &_changed_config.dds.domain_id ) )
+        {
+            if( _changed_config.dds.domain_id < 0 )
                 _changed_config.dds.domain_id = 0;
-            else if (_changed_config.dds.domain_id > 232)
+            else if( _changed_config.dds.domain_id > 232 )
                 _changed_config.dds.domain_id = 232;
         }
-        ImGui::Checkbox("No Reset after changes", &_no_reset);
+        ImGui::Checkbox( "No Reset after changes", &_no_reset );
 
-        if (ImGui::Checkbox("Set to defult values", &_set_defult)) {
-            if (_set_defult)
+        if( ImGui::Checkbox( "Set to defult values", &_set_defult ) )
+        {
+            if( _set_defult )
                 _changed_config = _defult_config;
             else
                 _changed_config = _current_config;
@@ -263,70 +289,87 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
         ImGui::PopItemWidth();
         ImGui::EndChild();
 
-        //window buttons
+        // window buttons
         float button_width = 105.0f;
         float spacing = 10.0f;
         float total_buttons_width = button_width * 4 + spacing * 2;
-        float start_x = (w - total_buttons_width) / 2.0f;
-        bool hasChanges = (_changed_config != _current_config);
+        float start_x = ( w - total_buttons_width ) / 2.0f;
+        bool hasChanges = ( _changed_config != _current_config );
 
-        ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 8);
+        ImGui::SetCursorPosY( ImGui::GetCursorPosY() + 8 );
 
-        ImGui::SetCursorPosX(start_x);
+        ImGui::SetCursorPosX( start_x );
 
-        if (ImGui::Button("Cancel", ImVec2(button_width, 25))) {
+        if( ImGui::Button( "Cancel", ImVec2( button_width, 25 ) ) )
+        {
             close_window();
         }
-        if (ImGui::IsItemHovered()) {
+        if( ImGui::IsItemHovered() )
+        {
             window.link_hovered();
-            ImGui::SetTooltip("%s", "Close without saving any changes");
+            ImGui::SetTooltip( "%s", "Close without saving any changes" );
         }
         ImGui::SameLine();
-        if (ImGui::Button("Factory Reset", ImVec2(button_width, 25))) {
-            enable_dds(error_message);
-            set_eth_config(_defult_config, error_message);
+        if( ImGui::Button( "Factory Reset", ImVec2( button_width, 25 ) ) )
+        {
+            enable_dds( error_message );
+            set_eth_config( _defult_config, error_message );
             close_window();
         }
-        if (ImGui::IsItemHovered()) {
+        if( ImGui::IsItemHovered() )
+        {
             window.link_hovered();
-            ImGui::SetTooltip("%s", "Reset settings back to defult values");
+            ImGui::SetTooltip( "%s", "Reset settings back to defult values" );
         }
         ImGui::SameLine();
-        RsImGui::RsImButton([&]() {if (ImGui::ButtonEx("Revert changes", ImVec2(button_width, 25))) {
-            _changed_config = _current_config;
-        };}, !hasChanges);
-        if (ImGui::IsItemHovered()) {
+        RsImGui::RsImButton(
+            [&]()
+            {
+                if( ImGui::ButtonEx( "Revert changes", ImVec2( button_width, 25 ) ) )
+                {
+                    _changed_config = _current_config;
+                };
+            },
+            ! hasChanges );
+        if( ImGui::IsItemHovered() )
+        {
             window.link_hovered();
-            ImGui::SetTooltip("%s", "Revert to current configuration values");
+            ImGui::SetTooltip( "%s", "Revert to current configuration values" );
         }
         ImGui::SameLine();
-        RsImGui::RsImButton([&]() {if (ImGui::ButtonEx("Apply", ImVec2(button_width, 25))) {
-            enable_dds(error_message);
-            set_eth_config(_changed_config, error_message);
-            close_window();
-        };}, !hasChanges);
-        if (ImGui::IsItemHovered()) {
+        RsImGui::RsImButton(
+            [&]()
+            {
+                if( ImGui::ButtonEx( "Apply", ImVec2( button_width, 25 ) ) )
+                {
+                    enable_dds( error_message );
+                    set_eth_config( _changed_config, error_message );
+                    close_window();
+                };
+            },
+            ! hasChanges );
+        if( ImGui::IsItemHovered() )
+        {
             window.link_hovered();
-            ImGui::SetTooltip("%s", "Apply changes");
+            ImGui::SetTooltip( "%s", "Apply changes" );
         }
-        if (ImGui::BeginPopupModal("No Changes Needed", NULL, ImGuiWindowFlags_AlwaysAutoResize)) {
-            ImGui::Text("No changes were made to the configuration.");
+        if( ImGui::BeginPopupModal( "No Changes Needed", NULL, ImGuiWindowFlags_AlwaysAutoResize ) )
+        {
+            ImGui::Text( "No changes were made to the configuration." );
 
-            if (ImGui::Button("OK", ImVec2(100, 25))) {
+            if( ImGui::Button( "OK", ImVec2( 100, 25 ) ) )
+            {
                 ImGui::CloseCurrentPopup();
             }
             ImGui::EndPopup();
         }
         ImGui::EndPopup();
-
     }
-    ImGui::PopStyleColor(6);
-    ImGui::PopStyleVar(2);
-
+    ImGui::PopStyleColor( 6 );
+    ImGui::PopStyleVar( 2 );
 }
 
 void rs2::dds_model::open_dds_tool_window()
 {
     _window_open = true;
 }
-
diff --git a/common/dds-model.h b/common/dds-model.h
index 1422cd814a..aa81170f07 100644
--- a/common/dds-model.h
+++ b/common/dds-model.h
@@ -8,7 +8,7 @@
 #include <set>
 #include <rsutils/type/ip-address.h>
 #include <rsutils/string/hexdump.h>
-#include "../third-party/rsutils/include/rsutils/type/eth-config.h"
+#include <../third-party/rsutils/include/rsutils/type/eth-config.h>
 #include <rsutils/json.h>
 #include <rsutils/json-config.h>
 
@@ -34,8 +34,6 @@ namespace rs2
     public:
         dds_model(rs2::device dev);
 
-        bool supports_DDS();
-
         void render_dds_config_window(ux_window& window, std::string& error_message);
 
         void open_dds_tool_window();
@@ -48,6 +46,8 @@ namespace rs2
 
         void enable_dds(std::string& error_message);
 
+        bool supports_DDS();
+
 
     private:
         rs2::device _device;
@@ -56,11 +56,13 @@ namespace rs2
         eth_config _current_config;
         eth_config _changed_config;
 
-        bool _window_open;
+        bool _window_open = false;
         bool _no_reset = false;
         bool _set_defult = false;
+        bool _dds_suported = false;
 
         void ipInputText(std::string label, rsutils::type::ip_address &ip);
         priority classifyPriority(link_priority &pr);
+        bool check_DDS_support();
     };
 }
diff --git a/common/device-model.cpp b/common/device-model.cpp
index 83830469b5..aa15b73429 100644
--- a/common/device-model.cpp
+++ b/common/device-model.cpp
@@ -1437,17 +1437,18 @@ namespace rs2
                     }
                 }
                 ImGuiSelectableFlags is_streaming_flag = (is_streaming) ? ImGuiSelectableFlags_Disabled : 0;
-                if (_dds_model.supports_DDS()) {
-                    if (ImGui::Selectable("DDS Configuration",false, is_streaming_flag))
+                if( _dds_model.supports_DDS() )
+                {
+                    if( ImGui::Selectable( "DDS Configuration", false, is_streaming_flag ) )
                     {
                         _dds_model.open_dds_tool_window();
                     }
-                    if (ImGui::IsItemHovered())
+                    if( ImGui::IsItemHovered() )
                     {
                         std::string tooltip = rsutils::string::from()
-                            << "Change the configuration of Ethernet based devices"
-                            << (is_streaming ? " (Disabled while streaming)" : "");
-                        ImGui::SetTooltip("%s", tooltip.c_str());
+                                           << "Change the configuration of Ethernet based devices"
+                                           << ( is_streaming ? " (Disabled while streaming)" : "" );
+                        ImGui::SetTooltip( "%s", tooltip.c_str() );
                     }
                 }
             }
@@ -1472,7 +1473,10 @@ namespace rs2
         }
 
         _calib_model.update(window, error_message);
-        _dds_model.render_dds_config_window(window , error_message);
+        if( _dds_model.supports_DDS() )
+        {
+            _dds_model.render_dds_config_window( window, error_message );
+        }
 
 
         ////////////////////////////////////////
diff --git a/tools/dds/dds-config/CMakeLists.txt b/tools/dds/dds-config/CMakeLists.txt
index f97ef91457..1f1484d73e 100644
--- a/tools/dds/dds-config/CMakeLists.txt
+++ b/tools/dds/dds-config/CMakeLists.txt
@@ -4,12 +4,13 @@ cmake_minimum_required( VERSION 3.1.0 )
 project( rs-dds-config )
 
 add_executable( ${PROJECT_NAME} )
+set(THIRD_PARTY_DIR "${PROJECT_SOURCE_DIR}/../../../third-party")
 
 file( GLOB_RECURSE RS_DDS_CONFIG_SOURCE_FILES
     LIST_DIRECTORIES false
     RELATIVE ${PROJECT_SOURCE_DIR}
     "${CMAKE_CURRENT_LIST_DIR}/*"
-    "${PROJECT_SOURCE_DIR}/../../../third-party/rsutils/include/rsutils/type/*"
+    "${THIRD_PARTY_DIR}/rsutils/include/rsutils/type/*"
     )
 target_sources( ${PROJECT_NAME} PRIVATE ${RS_DDS_CONFIG_SOURCE_FILES} )