diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0f5f59326..96dce54f6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @rdkcentral/advsecurity-maintainers
+*       @rdkcentral/common-library-maintainers @rdkcentral/rdkb-maintainers
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 055047932..c58b1b0b1 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -1,13 +1,20 @@
 name: "CLA"
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
 on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened,closed,synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA-Lite:
     name: "Signature"
-    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@main
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}
\ No newline at end of file
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}
diff --git a/.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml b/.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml
index da02b8b4f..7b8c1cba1 100644
--- a/.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml
+++ b/.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml
@@ -1,11 +1,18 @@
 name: Fossid Stateless Diff Scan
 
-on: pull_request
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: read
 
 jobs:
   call-fossid-workflow:
-    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@develop
-    secrets: 
+    if: ${{ ! github.event.pull_request.head.repo.fork }}
+    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@1.0.0
+    secrets:
         FOSSID_CONTAINER_USERNAME: ${{ secrets.FOSSID_CONTAINER_USERNAME }}
         FOSSID_CONTAINER_PASSWORD: ${{ secrets.FOSSID_CONTAINER_PASSWORD }}
         FOSSID_HOST_USERNAME: ${{ secrets.FOSSID_HOST_USERNAME }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd53ca31..da553577c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,21 @@ 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).
 
+#### [1.2.0](https://github.com/rdkcentral/common-library/compare/1.1.0...1.2.0)
+
+- RDKB-61594: [ccsp-common-library] Code development to remove macro [`#29`](https://github.com/rdkcentral/common-library/pull/29)
+- RDKB-61711: Limit threads stack sizes to 4M [`#19`](https://github.com/rdkcentral/common-library/pull/19)
+- Update CODEOWNERS [`#27`](https://github.com/rdkcentral/common-library/pull/27)
+- Deploy fossid_integration_stateless_diffscan_target_repo action [`#24`](https://github.com/rdkcentral/common-library/pull/24)
+- Deploy cla action [`#21`](https://github.com/rdkcentral/common-library/pull/21)
+- Update CODEOWNERS [`#20`](https://github.com/rdkcentral/common-library/pull/20)
+- RDKB-61711: OneWiFi: Limit stacks sizes to 4M [`4e76a76`](https://github.com/rdkcentral/common-library/commit/4e76a769ecc878c08c4e4d3f2f069b6fb48912dc)
+- Merge tag '1.1.0' into develop [`9ce1fa8`](https://github.com/rdkcentral/common-library/commit/9ce1fa85d0d575d62317947953b27ff71f870d62)
+
 #### [1.1.0](https://github.com/rdkcentral/common-library/compare/1.0.0...1.1.0)
 
+> 26 August 2025
+
 -  RDKB-58648 TCXB7-6946: Observing snmp_subagent crash with fingerprin… [`#14`](https://github.com/rdkcentral/common-library/pull/14)
 - RDKB-58521 : WAN Manager Telemetry Markers 2.0 - Phase 1 [`#12`](https://github.com/rdkcentral/common-library/pull/12)
 - RDKCOM-5360: RDKBNETWOR-3 DHCPManager implementation [`#10`](https://github.com/rdkcentral/common-library/pull/10)
@@ -13,7 +26,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - RDKB-60486: Fix the dmcli crash when returned parameterName or Value is NULL [`#6`](https://github.com/rdkcentral/common-library/pull/6)
 - RDKB-58648 TCXB7-6946: Observing snmp_subagent crash with fingerprint:[66870222] [`2dbaa72`](https://github.com/rdkcentral/common-library/commit/2dbaa72cf89038603789fe46e580f12b4471b3ff)
 - Update ccsp_base_api.c [`3c5416a`](https://github.com/rdkcentral/common-library/commit/3c5416a1505876fdb5cce2efd42bddbacbe41417)
-- Update ipc_msg.h [`a10bf44`](https://github.com/rdkcentral/common-library/commit/a10bf4469ec0142de58f78f690eef962d922043b)
+- Update CHANGELOG.md [`0e0cfdc`](https://github.com/rdkcentral/common-library/commit/0e0cfdca8f231204ff79599deda5e7f2eb58200a)
 
 #### 1.0.0
 
diff --git a/source/ccsp/components/common/DataModel/dml/components/DslhObjController/dslh_objco_access.c b/source/ccsp/components/common/DataModel/dml/components/DslhObjController/dslh_objco_access.c
index 0d03c25cd..d7bd89de7 100644
--- a/source/ccsp/components/common/DataModel/dml/components/DslhObjController/dslh_objco_access.c
+++ b/source/ccsp/components/common/DataModel/dml/components/DslhObjController/dslh_objco_access.c
@@ -1028,11 +1028,7 @@ DslhObjcoGetParamValueByName
     /*AnscTraceVerbose(("DslhObjcoGetParamValueByName -- name %s\n", pName));*/
     
     /* check whether it's a count of table (xxxNumberOfEntries) or not */
-#ifdef _64BIT_ARCH_SUPPORT_
     if(pSlapVariable->Syntax == (ULONG)SLAP_VAR_SYNTAX_uint32)
-#else
-    if(pSlapVariable->Syntax == SLAP_VAR_SYNTAX_uint32)
-#endif
     {
         pFind = _ansc_strstr(pName, TR69_NUMBER_OF_ENTRIES_STRING);
 
diff --git a/source/cosa/utilities/AnscObjectArray/AnscUIntArray/ansc_uint_array_co_process.c b/source/cosa/utilities/AnscObjectArray/AnscUIntArray/ansc_uint_array_co_process.c
index 427612722..06bc14ca5 100644
--- a/source/cosa/utilities/AnscObjectArray/AnscUIntArray/ansc_uint_array_co_process.c
+++ b/source/cosa/utilities/AnscObjectArray/AnscUIntArray/ansc_uint_array_co_process.c
@@ -74,6 +74,7 @@
 
 
 #include "ansc_uint_array_co_global.h"
+#include <stdint.h>
 
 
 /**********************************************************************
@@ -275,11 +276,7 @@ AnscUIntArrayGetAt
 
         pStorage    = (PUINT)pUIntArray->hStorage;
 
-#ifdef _64BIT_ARCH_SUPPORT_
-        return (ANSC_OBJECT_ARRAY_DATA)(ULONG)pStorage[ulIndex];
-#else
-        return (ANSC_OBJECT_ARRAY_DATA)pStorage[ulIndex];
-#endif
+        return (ANSC_OBJECT_ARRAY_DATA)(uintptr_t)pStorage[ulIndex];
     }
 
     return (ANSC_OBJECT_ARRAY_DATA)NULL;
@@ -335,11 +332,7 @@ AnscUIntArraySetAt
         PUINT                       pStorage;
 
         pStorage            = (PUINT)pUIntArray->hStorage;
-#ifdef _64BIT_ARCH_SUPPORT_
-        pStorage[ulIndex]   = (ULONG)Data;
-#else
-        pStorage[ulIndex]   = (UINT)Data;
-#endif
+        pStorage[ulIndex]   = (uintptr_t)Data;
     }
 }
 
@@ -420,11 +413,7 @@ AnscUIntArrayInsertAt
 
         for (i = 0; i < ulCount; i ++)
         {
-#ifdef _64BIT_ARCH_SUPPORT_
-            pStorage[i + ulIndex]   = (ULONG)Data;
-#else
-            pStorage[i + ulIndex]   = (UINT)Data;
-#endif
+            pStorage[i + ulIndex]   = (uintptr_t)Data;
         }
     }
 }
@@ -539,11 +528,7 @@ AnscUIntArrayAdd
             PUINT                   pStorage;
 
             pStorage = (PUINT)pUIntArray->hStorage;
-#ifdef _64BIT_ARCH_SUPPORT_
-            pStorage[pUIntArray->ulItemCount ++] = (ULONG)Data;
-#else
-            pStorage[pUIntArray->ulItemCount ++] = (UINT)Data;
-#endif
+            pStorage[pUIntArray->ulItemCount ++] = (uintptr_t)Data;
 
             return pUIntArray->ulItemCount;
         }
@@ -676,11 +661,7 @@ AnscUIntArrayFind
     LONG                            Count       = pUIntArray->ulItemCount;
     LONG                            i;
     PUINT                           pStorage    = (PUINT)pUIntArray->hStorage;
-#ifdef _64BIT_ARCH_SUPPORT_
-    UINT                            uSample     = (ULONG)Data;
-#else
-    UINT                            uSample     = (UINT)Data;
-#endif
+    UINT                            uSample     = (uintptr_t)Data;
 
     for (i = 0; i < Count; i ++)
     {
diff --git a/source/cosa/utilities/bsp_eng/bspeng_co_execute.c b/source/cosa/utilities/bsp_eng/bspeng_co_execute.c
index 900bd7142..cff8f8da8 100644
--- a/source/cosa/utilities/bsp_eng/bspeng_co_execute.c
+++ b/source/cosa/utilities/bsp_eng/bspeng_co_execute.c
@@ -72,7 +72,7 @@
 
 **********************************************************************/
 
-
+#include <stdint.h>
 #include "bspeng_co_global.h"
 #include "safec_lib_common.h"
 
@@ -6198,11 +6198,7 @@ BspTemplateEngGetSlapObjectString
 
             if (pString)
             {
-#ifdef _64BIT_ARCH_SUPPORT_
-                rc = sprintf_s(pString, ulSize, "%.08X", (UINT)(ULONG)pSlapVar->Variant.varHandle);
-#else
-		rc = sprintf_s(pString, ulSize, "%.08X", (UINT)pSlapVar->Variant.varHandle);
-#endif		
+                rc = sprintf_s(pString, ulSize, "%.08X", (UINT)(uintptr_t)pSlapVar->Variant.varHandle);
                 if(rc < EOK)
                 {
                     ERR_CHK(rc);
@@ -6421,11 +6417,7 @@ BspTemplateEngGetSlapObjectString
                                 pString + AnscSizeOfString(pString),
                                 ulSize+1,
                                 (i == 0)? "%.08X" : ".%.08X",
-#ifdef _64BIT_ARCH_SUPPORT_
-                                (UINT)(ULONG)pArray->Array.arrayHandle[i]
-#else
-                                (UINT)pArray->Array.arrayHandle[i]
-#endif
+                                (UINT)(uintptr_t)pArray->Array.arrayHandle[i]
                             );
                         if(rc < EOK)
                         {
diff --git a/source/debug_api/ansc_memory.c b/source/debug_api/ansc_memory.c
index e22b33b5f..ae8230baf 100644
--- a/source/debug_api/ansc_memory.c
+++ b/source/debug_api/ansc_memory.c
@@ -958,13 +958,8 @@ AnscTraceMemoryTable2
             sprintf
                 (
                     pTraceMessage,
-#ifdef _64BIT_ARCH_SUPPORT_
                     " *** mem_block = %p, size = %9d bytes, id = %6d, %s ***",
                     pMemoryAllocItem->MemoryPointer,
-#else
-                    " *** mem_block = 0x%8X, size = %9d bytes, id = %6d, %s ***",
-                    (UINT)pMemoryAllocItem->MemoryPointer,
-#endif
                     (int)pMemoryAllocItem->MemorySize,
                     (int)pMemoryAllocItem->AllocId,
                     pMemoryAllocItem->OwnerDesp
@@ -1449,11 +1444,7 @@ void AnscLiveMemoryInspectRecordDetail
             
                         pPrevAllocItem = AnscGetPrevMemoryAllocItem(pMemoryBlock);
 
-#ifdef _64BIT_ARCH_SUPPORT_
                         printf("found %p\n",pPrevAllocItem);
-#else
-                        printf("found %x\n",(UINT)pPrevAllocItem);
-#endif
                         
                         if ( !pPrevAllocItem )
                         {
diff --git a/source/util_api/ansc/AnscPlatform/ansc_debug.c b/source/util_api/ansc/AnscPlatform/ansc_debug.c
index e55f68d0b..46284e6d8 100644
--- a/source/util_api/ansc/AnscPlatform/ansc_debug.c
+++ b/source/util_api/ansc/AnscPlatform/ansc_debug.c
@@ -650,11 +650,7 @@ AnscDumpMemory
         /*
          *      Print the address
          */
-#ifdef _64BIT_ARCH_SUPPORT_
         _ansc_sprintf(PrintBuffer, "%p", pCurr);
-#else
-        _ansc_sprintf(PrintBuffer, "0x%08X", (unsigned int)pCurr);
-#endif
         _ansc_strcat (PrintBuffer, ": ");
 
         /*
@@ -695,11 +691,7 @@ AnscDumpMemory
         /*
          *      Print the address
          */
-#ifdef _64BIT_ARCH_SUPPORT_
         _ansc_sprintf(PrintBuffer, "%p", pCurr);
-#else
-        _ansc_sprintf(PrintBuffer, "0x%08X", (unsigned int)pCurr);
-#endif
         _ansc_strcat (PrintBuffer, ": " );
 
         /*
diff --git a/source/util_api/ansc/AnscPlatform/ansc_file_io.c b/source/util_api/ansc/AnscPlatform/ansc_file_io.c
index 6a2e1aa77..a1932276f 100644
--- a/source/util_api/ansc/AnscPlatform/ansc_file_io.c
+++ b/source/util_api/ansc/AnscPlatform/ansc_file_io.c
@@ -88,7 +88,7 @@
 
 **********************************************************************/
 
-
+#include <stdint.h>
 #include "ansc_platform.h"
 #include "ansc_external_storage.h"
 #include "ansc_crypto_interface.h"
@@ -245,12 +245,7 @@ AnscReadFile
 
     if ( pFileInfo->bZlibCompressed )
     {
-#ifdef _64BIT_ARCH_SUPPORT_
-	ULONG uHandle = pFileInfo->Handle;
-	iReturnsize  = _ansc_get_file_size((VOID*)uHandle);
-#else
-	iReturnsize  = _ansc_get_file_size((VOID*)pFileInfo->Handle);
-#endif
+	iReturnsize  = _ansc_get_file_size((VOID*)(uintptr_t)pFileInfo->Handle);
 	if ( iReturnsize < 0 )
 	{
 		return ANSC_STATUS_FAILURE;
@@ -487,12 +482,7 @@ AnscGetFileSize
     {
         int iReadSize = (int)0;
 
-#ifdef _64BIT_ARCH_SUPPORT_
-	ULONG uHandle = pFileInfo->Handle;
-	iReturnSize = _ansc_get_file_size((VOID*)uHandle);
-#else
-	iReturnSize = _ansc_get_file_size((VOID*)pFileInfo->Handle);
-#endif
+	iReturnSize = _ansc_get_file_size((VOID*)(uintptr_t)pFileInfo->Handle);
 	if ( iReturnSize < 0 )
 	{
 		return 0;
@@ -546,12 +536,7 @@ AnscGetFileSize
     else
     {
 	/*CID: 59651 Improper use of negative value*/
-#ifdef _64BIT_ARCH_SUPPORT_
-        ULONG uHandle = pFileInfo->Handle;
-        iReturnSize = _ansc_get_file_size((VOID*)uHandle);
-#else
-        iReturnSize = _ansc_get_file_size((VOID*)pFileInfo->Handle);
-#endif
+        iReturnSize = _ansc_get_file_size((VOID*)(uintptr_t)pFileInfo->Handle);
         if(iReturnSize < 0)
 	{
 		return	0;
diff --git a/source/util_api/ansc/AnscPlatform/user_file_io.c b/source/util_api/ansc/AnscPlatform/user_file_io.c
index f62fcaf16..e7ac18419 100644
--- a/source/util_api/ansc/AnscPlatform/user_file_io.c
+++ b/source/util_api/ansc/AnscPlatform/user_file_io.c
@@ -74,6 +74,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "ansc_global.h"
 
 #include "user_base.h"
@@ -308,14 +309,9 @@ inline int
 user_get_file_size(PVOID h)
 {
 	int length = 0;
-#ifdef _64BIT_ARCH_SUPPORT_
-	length = lseek((int)(ULONG)h, 0, SEEK_END);
-	lseek((int)(ULONG)h, 0, SEEK_SET);
-#else
-	length = lseek((int)h, 0, SEEK_END);
-	lseek((int)h, 0, SEEK_SET);
-#endif
-	return length;
+	length = lseek((int)(uintptr_t)h, 0, SEEK_END);
+	lseek((int)(uintptr_t)h, 0, SEEK_SET);
+        return length;
 }
 
 /*
diff --git a/source/util_api/ansc/AnscXmlDomParser/ansc_xml_dom_node_base.c b/source/util_api/ansc/AnscXmlDomParser/ansc_xml_dom_node_base.c
index 89c48a843..c504eac73 100644
--- a/source/util_api/ansc/AnscXmlDomParser/ansc_xml_dom_node_base.c
+++ b/source/util_api/ansc/AnscXmlDomParser/ansc_xml_dom_node_base.c
@@ -253,17 +253,9 @@ AnscXmlDomNodeRemove
         {
             AnscXmlWarning
                 (
-#ifdef _64BIT_ARCH_SUPPORT_
                     "The child node queue of XML node '%s' is corrupted.cookie1= %p\n",
-#else
-                    "The child node queue of XML node '%s' is corrupted.cookie1= 0x%.8X\n",
-#endif
                     (char *)pXmlNode->ChildNodeQueueLock,
-#ifdef _64BIT_ARCH_SUPPORT_
                     (void*)pNameAttr->StringData
-#else
-                    (unsigned int)pNameAttr->StringData
-#endif
                 );
         }
 
@@ -278,30 +270,17 @@ AnscXmlDomNodeRemove
         {
             AnscXmlWarning
                 (
-#ifdef _64BIT_ARCH_SUPPORT_
                     "The child node queue of XML node is corrupted. cookie2= %p\n",
                     (void*)pXmlNode->AttributesListLock
-#else
-                    "The child node queue of XML node is corrupted. cookie2= 0x%.8X\n",
-                    (unsigned int)pXmlNode->AttributesListLock
-#endif
                 );
         }
         else
         {
             AnscXmlWarning
                 (
-#ifdef _64BIT_ARCH_SUPPORT_
                     "The child node queue of XML node '%s' is corrupted.cookie2= %p\n",
-#else
-                    "The child node queue of XML node '%s' is corrupted.cookie2= 0x%.8X\n",
-#endif
                     (char *)pXmlNode->AttributesListLock,
-#ifdef _64BIT_ARCH_SUPPORT_
                     (void*)pNameAttr->StringData
-#else
-                    (unsigned int)pNameAttr->StringData
-#endif
                 );
         }
 
diff --git a/source/util_api/ccsp_msg_bus/ccsp_message_bus.c b/source/util_api/ccsp_msg_bus/ccsp_message_bus.c
index 28e071b0f..d684b2cb2 100644
--- a/source/util_api/ccsp_msg_bus/ccsp_message_bus.c
+++ b/source/util_api/ccsp_msg_bus/ccsp_message_bus.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <pthread.h>
+#include <inttypes.h>
 #include <dbus/dbus.h>
 #include <ccsp_message_bus.h>
 #include "ccsp_base_api.h"
@@ -1566,33 +1567,17 @@ void ccsp_handle_rbus_component_reply (void* bus_handle, rbusMessage msg, rbusVa
         case RBUS_INT64:
         {
             rbusMessage_GetInt64(msg, &i64);
-#ifdef _64BIT_ARCH_SUPPORT_
-            n = snprintf(pTmp, 0, "%ld", i64) + 1;
-#else
-            n = snprintf(pTmp, 0, "%lld", i64) + 1;
-#endif
+            n = snprintf(pTmp, 0, "%" PRId64, i64) + 1;
             *pStringValue = bus_info->mallocfunc(n);
-#ifdef _64BIT_ARCH_SUPPORT_
-            snprintf(*pStringValue, (unsigned int)n, "%ld", i64);
-#else
-            snprintf(*pStringValue, (unsigned int)n, "%lld", i64);
-#endif	    
+            snprintf(*pStringValue, (unsigned int)n, "%" PRId64, i64);
            break;
         }
         case RBUS_UINT64:
         {
             rbusMessage_GetInt64(msg, &i64);
-#ifdef _64BIT_ARCH_SUPPORT_
-            n = snprintf(pTmp, 0, "%lu", (uint64_t)i64) + 1;
-#else
-            n = snprintf(pTmp, 0, "%llu", (uint64_t)i64) + 1;
-#endif
+            n = snprintf(pTmp, 0, "%" PRIu64, (uint64_t)i64) + 1;
             *pStringValue = bus_info->mallocfunc(n);
-#ifdef _64BIT_ARCH_SUPPORT_
-            snprintf(*pStringValue, (unsigned int)n, "%lu", (uint64_t)i64);
-#else	
-            snprintf(*pStringValue, (unsigned int)n, "%llu", (uint64_t)i64);
-#endif	    
+            snprintf(*pStringValue, (unsigned int)n, "%" PRIu64, (uint64_t)i64);
             break;
         }
         case RBUS_SINGLE:
diff --git a/source/util_api/tls/components/TlsHandShaker/tls_hso_control.c b/source/util_api/tls/components/TlsHandShaker/tls_hso_control.c
index f5e0952f5..8acf8be41 100644
--- a/source/util_api/tls/components/TlsHandShaker/tls_hso_control.c
+++ b/source/util_api/tls/components/TlsHandShaker/tls_hso_control.c
@@ -475,21 +475,12 @@ TlsHsoCalKeys30
     PTLS_RECORD_STATE               pRecordStateR      = (PTLS_RECORD_STATE          )&pMyObject->RecordStateR;
     PTLS_MEC_INTERFACE              pTlsMecIf          = (PTLS_MEC_INTERFACE         )pMyObject->hTlsMecIf;
     PTLS_CRYPTO_PROVIDER_OBJECT     pTlsCryptoProvider = (PTLS_CRYPTO_PROVIDER_OBJECT)pTlsMecIf->GetTlsCryptoProvider(pTlsMecIf->hOwnerContext);
-#ifdef _64BIT_ARCH_SUPPORT_
     ANSC_CRYPTO_KEY*                pMacSecretC        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->MacSecret : &pRecordStateW->MacSecret;
     ANSC_CRYPTO_KEY*                pMacSecretS        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->MacSecret : &pRecordStateR->MacSecret;
     ANSC_CRYPTO_KEY*                pCipherKeyC        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherKey : &pRecordStateW->CipherKey;
     ANSC_CRYPTO_KEY*                pCipherKeyS        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherKey : &pRecordStateR->CipherKey;
     ANSC_CRYPTO_IV*                 pCipherIV_C        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherIV  : &pRecordStateW->CipherIV;
     ANSC_CRYPTO_IV*                 pCipherIV_S        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherIV  : &pRecordStateR->CipherIV;
-#else
-    ANSC_CRYPTO_KEY*                pMacSecretC        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->MacSecret : &pRecordStateW->MacSecret;
-    ANSC_CRYPTO_KEY*                pMacSecretS        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->MacSecret : &pRecordStateR->MacSecret;
-    ANSC_CRYPTO_KEY*                pCipherKeyC        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherKey : &pRecordStateW->CipherKey;
-    ANSC_CRYPTO_KEY*                pCipherKeyS        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherKey : &pRecordStateR->CipherKey;
-    ANSC_CRYPTO_IV*                 pCipherIV_C        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherIV  : &pRecordStateW->CipherIV;
-    ANSC_CRYPTO_IV*                 pCipherIV_S        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherIV  : &pRecordStateR->CipherIV;
-#endif
     PUCHAR                          pKeyBlock          = (PUCHAR                     )NULL;
     ULONG                           write_key_length   = 0;
     ULONG                           key_block_offset   = 0;
@@ -845,21 +836,12 @@ TlsHsoCalKeys31
     PTLS_RECORD_STATE               pRecordStateR      = (PTLS_RECORD_STATE          )&pMyObject->RecordStateR;
     PTLS_MEC_INTERFACE              pTlsMecIf          = (PTLS_MEC_INTERFACE         )pMyObject->hTlsMecIf;
     PTLS_CRYPTO_PROVIDER_OBJECT     pTlsCryptoProvider = (PTLS_CRYPTO_PROVIDER_OBJECT)pTlsMecIf->GetTlsCryptoProvider(pTlsMecIf->hOwnerContext);
-#ifdef _64BIT_ARCH_SUPPORT_
     ANSC_CRYPTO_KEY*                pMacSecretC        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->MacSecret : &pRecordStateW->MacSecret;
     ANSC_CRYPTO_KEY*                pMacSecretS        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->MacSecret : &pRecordStateR->MacSecret;
     ANSC_CRYPTO_KEY*                pCipherKeyC        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherKey : &pRecordStateW->CipherKey;
     ANSC_CRYPTO_KEY*                pCipherKeyS        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherKey : &pRecordStateR->CipherKey;
     ANSC_CRYPTO_IV*                 pCipherIV_C        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherIV  : &pRecordStateW->CipherIV;
     ANSC_CRYPTO_IV*                 pCipherIV_S        = (ANSC_CRYPTO_KEY*           )(ULONG)(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherIV  : &pRecordStateR->CipherIV;
-#else
-    ANSC_CRYPTO_KEY*                pMacSecretC        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->MacSecret : &pRecordStateW->MacSecret;
-    ANSC_CRYPTO_KEY*                pMacSecretS        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->MacSecret : &pRecordStateR->MacSecret;
-    ANSC_CRYPTO_KEY*                pCipherKeyC        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherKey : &pRecordStateW->CipherKey;
-    ANSC_CRYPTO_KEY*                pCipherKeyS        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherKey : &pRecordStateR->CipherKey;
-    ANSC_CRYPTO_IV*                 pCipherIV_C        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateR->CipherIV  : &pRecordStateW->CipherIV;
-    ANSC_CRYPTO_IV*                 pCipherIV_S        = (ANSC_CRYPTO_KEY*           )(pSecurityParams->ConnectionEnd == TLS_CONNECTION_END_server)? &pRecordStateW->CipherIV  : &pRecordStateR->CipherIV;
-#endif
     PUCHAR                          pKeyBlock          = (PUCHAR                     )NULL;
     ULONG                           write_key_length   = 0;
     ULONG                           key_block_offset   = 0;
diff --git a/systemd_units/onewifi.service b/systemd_units/onewifi.service
index 636af2374..ec859510d 100644
--- a/systemd_units/onewifi.service
+++ b/systemd_units/onewifi.service
@@ -23,6 +23,7 @@ After=CcspPandMSsp.service
 [Service]
 Type=forking
 PIDFile=/var/tmp/OneWifi.pid
+LimitSTACK=4096K
 WorkingDirectory=/usr/ccsp/wifi
 Environment="Subsys=eRT."
 Environment="LOG4C_RCPATH=/etc"