merge main & resolve conflicts

Author: khadni

public/images/ccip/ccip-hl-v1.7.jpg

@@ -12,13 +12,21 @@ metadata:
   estimatedTime: "25 minutes"
 ---
 
-import { ClickToZoom } from "@components"
+import { Aside, ClickToZoom } from "@components"
 
 CCIP's offchain architecture includes the following:
 
 - **Decentralized Oracle Networks (DONs)**: Running offchain consensus using the Offchain Reporting Protocol (OCR).
 - **Interaction Components**: Managing communication between the CCIP DONs.
 
+<Aside type="note">
+  Based on user demand, CCIP's architecture is evolving to provide enhanced support for modular security and
+  configurable compliance capabilities. As part of this transition, the Risk Management Network is being adapted to
+  align with this broader, more flexible architecture. Please see the [onchain
+  architecture](/ccip/concepts/architecture/onchain/evm/components#rmn-contract) for more information on the current
+  functionality of the Risk Management Network.
+</Aside>
+
 ## Components
 
 ### CCIP Decentralized Oracle Networks

src/content/ccip/concepts/architecture/offchain/overview.mdx

@@ -44,7 +44,7 @@ CCIP's robust security framework is built upon several core components:
 - **High-Quality, Sybil-Resistant Node Operators**: The system is secured by the same globally distributed, security-reviewed, public node operators that secure other Chainlink services, validate leading blockchain networks, and operate traditional Web2 infrastructure. Each independent CCIP node is run by a distinct organization with extensive DevOps expertise and rigorous private key management security practices.
 
 <ClickToZoom
-  src="/images/ccip/ccip-hl-v1.7.png"
+  src="/images/ccip/ccip-hl-v1.7.jpg"
   alt="Chainlink CCIP Architecture"
   style="display: block; margin: 2rem auto; max-height: 60vh; width: auto;"
 />

src/content/ccip/index.mdx

@@ -1996,6 +1996,14 @@ CCIP's offchain architecture includes the following:
 - **Decentralized Oracle Networks (DONs)**: Running offchain consensus using the Offchain Reporting Protocol (OCR).
 - **Interaction Components**: Managing communication between the CCIP DONs.
 
+<Aside type="note">
+  Based on user demand, CCIP's architecture is evolving to provide enhanced support for modular security and
+  configurable compliance capabilities. As part of this transition, the Risk Management Network is being adapted to
+  align with this broader, more flexible architecture. Please see the [onchain
+  architecture](/ccip/concepts/architecture/onchain/evm/components#rmn-contract) for more information on the current
+  functionality of the Risk Management Network.
+</Aside>
+
 ## Components
 
 ### CCIP Decentralized Oracle Networks