diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
new file mode 100644
index 0000000..7b2c503
--- /dev/null
+++ b/.github/workflows/pr-lint.yml
@@ -0,0 +1,18 @@
+name: PR Format Check
+
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize, reopened]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: pr-format-check-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    uses: rdkcentral/build_tools_workflows/.github/workflows/pr-lint.yml@develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ef26a3..ea74d30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.4.0](https://github.com/rdkcentral/moca-agent/compare/2.3.0...2.4.0)
+
+- RDKB-66032 : Add PR Format Check workflow [`#37`](https://github.com/rdkcentral/moca-agent/pull/37)
+- RDKB-62906: Devices reporting non-moca clients to the moca interface [`#36`](https://github.com/rdkcentral/moca-agent/pull/36)
+- Merge tag '2.3.0' into develop [`91f1f93`](https://github.com/rdkcentral/moca-agent/commit/91f1f9346598ca8751600947c074aa28e9f1e9f0)
+
 #### [2.3.0](https://github.com/rdkcentral/moca-agent/compare/2.2.0...2.3.0)
 
+> 7 May 2026
+
 - RDKB-64598 : Coverity issues in ccsp-moca component [`#33`](https://github.com/rdkcentral/moca-agent/pull/33)
+- Add changelog for release 2.3.0 [`0de860c`](https://github.com/rdkcentral/moca-agent/commit/0de860c6e5621bc78d9cb1e6735db4597e19ee66)
 - Merge tag '2.2.0' into develop [`91c8474`](https://github.com/rdkcentral/moca-agent/commit/91c8474bfe3250aca23643fddfbfae4b5b318f83)
 
 #### [2.2.0](https://github.com/rdkcentral/moca-agent/compare/2.1.0...2.2.0)
diff --git a/source/TR-181/middle_layer_src/cosa_moca_network_info.c b/source/TR-181/middle_layer_src/cosa_moca_network_info.c
index 02795f1..03e3d85 100644
--- a/source/TR-181/middle_layer_src/cosa_moca_network_info.c
+++ b/source/TR-181/middle_layer_src/cosa_moca_network_info.c
@@ -317,6 +317,8 @@ MocaIf_GetAssocDevices
 
 #ifdef CISCO_MOCA_CPE
                 pnum_cpes = *pulCount ; //temporary work around to bypass connected client behind node implementation for CXB3 due to CISCOXB3-4969
+#else
+                pnum_cpes = *pulCount ; //fix solve incorrect moca client count
 #endif
 
                 if (pnum_cpes > *pulCount)
@@ -601,7 +603,7 @@ void Set_MoCADevices_Status_Offline()
                         free(cur->ssidType);
                         cur->ssidType = NULL;
                     }
-                    cur->ssidType = strdup("Device.MoCA.Interface.1.");
+                    cur->ssidType = strdup(" ");
                     cur->Updated = 1;
                     cur->StatusChange = 1;
                 }
@@ -669,7 +671,7 @@ void Send_Update_to_LMLite(BOOL defaultSend)
                                             (NULL != cur->AssociatedDevice) ? cur->AssociatedDevice : "NULL",
                                             (NULL != cur->ssidType) ? cur->ssidType : "NULL",
                                             (NULL != cur->parentMac) ? cur->parentMac : "NULL",
-                                            "Device.MoCA.Interface.1.",
+                                            " ",
                                             cur->RSSI,
                                             cur->Status);
 
@@ -828,10 +830,13 @@ void* SynchronizeMoCADevices(void *arg)
             	{
                     Set_MoCADevices_Status_Online(CpeMacHoldingBuf, i);                    
             	}
+                else
+		{
+		    Set_MoCADevices_Status_Offline();
+                    Send_Update_to_LMLite(FALSE);
+                }
             }
 
-            Set_MoCADevices_Status_Offline();
-            Send_Update_to_LMLite(FALSE);
         }
         else
         {