diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index 3a5bbd9f6..e5a68542f 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -11,6 +11,6 @@ on:
 jobs:
   changelog:
     uses: ansible-network/github_actions/.github/workflows/changelog.yml@main
-    if: (github.event_name != 'schedule' && github.event_name != 'push' && !contains(github.event.pull_request.labels.*.name, 'new_resource_module'))
+    if: (github.event_name != 'schedule' && github.event_name != 'push' && !contains(github.event.pull_request.labels.*.name, 'new_resource_module') && !contains(github.event.pull_request.labels.*.name, 'documentation'))
   sanity:
     uses: ansible-network/github_actions/.github/workflows/sanity.yml@main
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d3ecd6f70..e9c78a734 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,9 +1,124 @@
-======================================
-Dellemc.Enterprise_Sonic Release Notes
-======================================
+=======================================
+Dellemc.Enterprise\_Sonic Release Notes
+=======================================
 
 .. contents:: Topics
 
+v2.5.0
+======
+
+Release Summary
+---------------
+
+| Release Date: 2024-0812
+|
+| This release provides enhanced Dell Enterprise SONiC Ansible Collection support for SONiC 4.x images.
+| In addition to new resource modules to support previously existing functionality, it provides
+| support for several new features released in SONiC releases 4.1, 4.2, and 4.4.
+| It also provides bug fixes and enhancements for support of features that were initially introduced
+| in previous Enterprise SONiC Ansible releases. The changelog describes changes made to the modules
+| included in this collection since release 2.0.0.
+|
+| Additional details are described below.
+| 1) Update the "requires_ansible" version in the meta/runtime.yml file for this collection
+| to the oldest supported version of ansible-core. (This was recently changed by Redhat/Ansible
+| to version "2.15.0".)
+| 2) Update the list of resource modules in the README file to include all currently available
+| resource modules for this collection.
+
+Minor Changes
+-------------
+
+- bgp_af - Add support for 'import vrf' commands (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/351).
+- sonic_bfd - Add playbook check and diff modes support for bfd module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+- sonic_bgp - Add playbook check and diff modes support for bgp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+- sonic_bgp - Add support BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+- sonic_bgp - Fix GitHub issue# 416 (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/418).
+- sonic_bgp_af - Add playbook check and diff modes support for bgp_af module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+- sonic_bgp_af - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+- sonic_bgp_af - Add support for aggregate address configuration(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/398).
+- sonic_bgp_af - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/400)
+- sonic_bgp_as_paths - Add playbook check and diff modes support for bgp_as_paths module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+- sonic_bgp_communities - Add playbook check and diff modes support for bgp_communities module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+- sonic_bgp_ext_communities - Add playbook check and diff modes support for bgp_ext_communities module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+- sonic_bgp_neighbors - Add playbook check and diff modes support for bgp_neighbors module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/360).
+- sonic_bgp_neighbors - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+- sonic_bgp_neighbors - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/335).
+- sonic_bgp_neighbors - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/336).
+- sonic_bgp_neighbors - Add support for the "fabric_external" option (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/336).
+- sonic_bgp_neighbors_af - Add playbook check and diff modes support for bgp_neighbors_af module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/360).
+- sonic_bgp_neighbors_af - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+- sonic_copp - Add playbook check and diff modes support for copp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+- sonic_dhcp_relay - Add playbook check and diff modes support for dhcp_relay module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+- sonic_dhcp_snooping - Add playbook check and diff modes support for dhcp_snooping module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+- sonic_interfaces - Add description, enabled option support for Loopback interfaces (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+- sonic_interfaces - Fix GitHub issue 357 - set proper default value when deleted (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/366).
+- sonic_interfaces - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+- sonic_l3_interfaces - Add playbook check and diff modes support for l3_interfaces module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/328).
+- sonic_l3_interfaces - Add support for USGv6R1 related features (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/374).
+- sonic_l3_interfaces - Fix IPv6 default dad configuration handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/428).
+- sonic_lag_interfaces - Add evpn ethernet-segment support for LAG interfaces (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/403).
+- sonic_lldp_global - Add playbook check and diff modes support for lldp_global module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+- sonic_logging - Add support for protocol option in logging module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/317).
+- sonic_mac - Add playbook check and diff modes support for mac module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+- sonic_mclag - Add playbook check and diff modes support for mclag module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+- sonic_mclag - Enable session-vrf command support in mclag(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/299).
+- sonic_port_breakout - Add playbook check and diff modes support for port_breakout module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+- sonic_port_group - Make error message for port group facts gathering more descriptive (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/396).
+- sonic_prefix_lists - Add playbook check and diff modes support for prefix_lists module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/331).
+- sonic_qos_maps - Comment out PFC priority group map tests cases (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/395).
+- sonic_qos_scheduler - Update states implementation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/373).
+- sonic_route_maps - Add UT for route maps module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/384).
+- sonic_route_maps - Add playbook check and diff modes support for route_maps module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/331).
+- sonic_route_maps - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+- sonic_route_maps - Add support for the 'set tag' option and synchronize module documentation with argspec and model (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/413).
+- sonic_stp - Add playbook check and diff modes support for stp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+- sonic_system - Add support for 'standard_extended' interface-naming mode (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/352).
+- sonic_system - Add support for configuring auto-breakout feature (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/342).
+- sonic_system - Adding Versatile Hash feature.(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/401).
+- sonic_system - Enable auditd command support(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/405).
+- sonic_system - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/388).
+- sonic_vxlan - Fix GitHub issue 376 - Change vxlan module get_fact function (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/393).
+- sonic_vxlans - Add playbook check and diff modes support for vxlans module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+- sonic_vxlans - Add support for the "external_ip" vxlan option (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/330).
+
+Bugfixes
+--------
+
+- sonic_bfd - Fix BFD states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+- sonic_bgp_neighbors - Fix issues with deleted state (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/335).
+- sonic_copp - Fix CoPP states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/381).
+- sonic_interfaces - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/377).
+- sonic_interfaces - Fix replaced and overridden state handling for Loopback interfaces (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+- sonic_l2_interfaces - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/410).
+- sonic_l3_interfaces - Fix replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/431).
+- sonic_mac - Fix MAC states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+- sonic_prefix_lists - Fix idempotency failure (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/354).
+- sonic_prefix_lists - Fix replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/354).
+- sonic_qos_pfc - Add back accidentally deleted line of code  (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/391).
+- sonic_static_routes - Fix static routes states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+- sonic_vlans - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/377).
+
+New Modules
+-----------
+
+- dellemc.enterprise_sonic.sonic_login_lockout - Manage Global Login Lockout configurations on SONiC.
+- dellemc.enterprise_sonic.sonic_mgmt_servers - Manage management servers configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_ospf_area - configure OSPF area settings on SONiC.
+- dellemc.enterprise_sonic.sonic_ospfv2 - Configure global OSPFv2 protocol settings on SONiC.
+- dellemc.enterprise_sonic.sonic_ospfv2_interfaces - Configure OSPFv2 interface mode protocol settings on SONiC.
+- dellemc.enterprise_sonic.sonic_pim_global - Manage global PIM configurations on SONiC.
+- dellemc.enterprise_sonic.sonic_pim_interfaces - Manage interface-specific PIM configurations on SONiC.
+- dellemc.enterprise_sonic.sonic_poe - Manage PoE configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_buffer - Manage QoS buffer configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_interfaces - Manage QoS interfaces configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_maps - Manage QoS maps configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_pfc - Manage QoS PFC configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_scheduler - Manage QoS scheduler configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_qos_wred - Manage QoS WRED profiles configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_roce - Manage RoCE QoS configuration on SONiC.
+- dellemc.enterprise_sonic.sonic_sflow - configure sflow settings on SONiC.
+- dellemc.enterprise_sonic.sonic_vrrp - Configure VRRP protocol settings on SONiC.
 
 v2.4.0
 ======
@@ -26,7 +141,6 @@ Release Summary
 | 3) Update the list of resource modules in the README file to include all currently available
 | resource modules for this collection.
 
-
 Bugfixes
 --------
 
@@ -55,7 +169,6 @@ Release Summary
 | Please refer to the "CHANGELOG.rst" file at the top directory level of this repo for additional
 | details on the contents of this release.
 
-
 Minor Changes
 -------------
 
@@ -149,7 +262,6 @@ Release Summary
 | version and the revised "galaxy.yml" file for this release enables installation of these
 | newer versions.
 
-
 Minor Changes
 -------------
 
@@ -170,7 +282,6 @@ Release Summary
 | Enterprise SONiC Ansible releases. The changelog describes changes made to the modules and plugins
 | included in this collection since release 2.0.0.
 
-
 Minor Changes
 -------------
 
@@ -292,7 +403,6 @@ Release Summary
 
 This release provides Dell SONiC Enterprise Ansible Collection support for SONiC 4.x images. It is the first release for the 2.x branch of the collection. Subsequent enhancements for support of SONiC 4.x images will also be provided as needed on the 2.x branch. This release also contains bugfixes and enhancements to supplement the Ansible functionality provided previously for SONiC 3.x images. The changelog describes changes made to the modules and plugins included in this collection since release 1.1.0.
 
-
 Minor Changes
 -------------
 
diff --git a/README.md b/README.md
index b6139dff3..d61fe51da 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,8 @@ Name | Description
 [**sonic_copp**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_copp_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-copp-module)| Manage CoPP configuration
 [**sonic_dhcp_relay**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_dhcp_relay_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-dhcp-relay-module)| Manage DHCP and DHCPv6 relay configurations
 [**sonic_dhcp_snooping**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_dhcp_snooping_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-dhcp-snooping-module)| Manage DHCP Snooping
+[**sonic_fips**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_fips_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-fips-module)| Manage FIPS configurations
+[**sonic_image_management**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_image_management_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-image-management-module)| Manage installation of Enterprise SONiC image, software patch and firmware updater.
 [**sonic_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-interfaces-module)| Configure Interface attributes
 [**sonic_ip_neighbor**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_sonic_ip_neighbor_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sonic-ip-neighbor-module)| Manage IP neighbor global configuration
 [**sonic_l2_acls**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_l2_acls_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sonic-l2-acls-module)| Manage Layer 2 access control lists (ACL) configurations
@@ -55,17 +57,35 @@ Name | Description
 [**sonic_l3_acls**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_l3_acls_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sonic-l3-acls-module)| Manage Layer 3 access control lists (ACL) configurations
 [**sonic_l3_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_l3_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-l3-interfaces-module)| Configure the IPv4 and IPv6 parameters on Interfaces
 [**sonic_lag_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_lag_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-lag-interfaces-module)| Manage link aggregation group (LAG) interface parameters
+[**sonic_ldap**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_ldap_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-ldap-module)| Configure global LDAP server settings
 [**sonic_lldp_global**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_sonic_lldp_global_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sonic-lldp-global-module)| Manage Global LLDP configurations
+[**sonic_lldp_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_sonic_lldp_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sonic-lldp-interfaces-module)| Manage interface LLDP configurations
 [**sonic_logging**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_logging_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-logging-module)| Manage logging configuration
+[**sonic_login_lockout**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_login_lockout_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-login-lockout-module)| Manage Global Login Lockout configuration
 [**sonic_mac**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_mac_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-mac-module)| Manage MAC configuration
 [**sonic_mclag**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_mclag_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-mclag-module)| Manage multi chassis link aggregation groups domain (MCLAG) and its parameters
+[**sonic_mgmt_servers**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_mgmt_servers_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-mgmt-servers-module)| Manage management servers configuration
 [**sonic_ntp**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_ntp_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-ntp-module)| Manage NTP configuration
+[**sonic_ospf_area**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_ospf_area_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-ospf-area-module)| Configure OSPF area setting
+[**sonic_ospfv2**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_ospfv2_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-ospfv2-module)| Configure global OSPFv2 protocol settings
+[**sonic_ospfv2_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_ospfv2_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-ospfv2-interfaces-module)| Configure OSPFv2 interface mode protocol settings
+[**sonic_pim_global**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_pim_global_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-pim-global-module)| Manage global PIM configuration
+[**sonic_pim_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_pim_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-pim-interfaces-module)| Manage interface-specific PIM configurations
 [**sonic_pki**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_pki_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-pki-module)| Manages PKI attributes
+[**sonic_poe**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_poe_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-poe-module)| Manage Power over Ethernet PoE configuration
 [**sonic_port_breakout**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_port_breakout_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-port-breakout-module)| Configure port breakout settings on physical interfaces
 [**sonic_port_group**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_port_group_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-port-group-module)| Manage port group configuration
 [**sonic_prefix_lists**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_prefix_lists_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-prefix-lists-module)| Manage prefix list configuration
+[**sonic_qos_buffer**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_buffer_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos-buffer-module)| Manage QoS buffer configuration
+[**sonic_qos_qos_interfaces**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_interfaces_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos_interfaces-module)| Manage QoS interfaces configuration
+[**sonic_qos_maps**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_maps_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos_maps-module)| Manage QoS maps configuration
+[**sonic_qos_pfc**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_pfc_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos-pfc-module)| Manage QoS PFC configuration    
+[**sonic_qos_scheduler**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_scheduler_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos-scheduler-module)| Manage QoS scheduler configuration
+[**sonic_qos_wred**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_qos_wred_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-qos-scheduler-module)| Manage QoS WRED profiles configuration
 [**sonic_radius_server**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_radius_server_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-radius-server-module)| Manage RADIUS server and its parameters
+[**sonic_roce**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_roce_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-roce-module)| Manage RoCE QoS configuration
 [**sonic_route_maps**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_route_maps_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-route-maps-module)| Manage route map configuration
+[**sonic_sflow**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_sflow_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-sflow-module)| Manage sflow configuration settings
 [**sonic_static_routes**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_static_routes_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-static-routes-module)| Manage static routes configuration
 [**sonic_stp**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_stp_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-stp-module)| Manage STP configuration
 [**sonic_system**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_system_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-system-module)| Configure system parameters
@@ -74,6 +94,7 @@ Name | Description
 [**sonic_vlan_mapping**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_vlan_mapping_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-vlan-mapping-module)| Configure vlan mappings
 [**sonic_vlans**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_vlans_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-vlans-module)| Manage VLAN and its parameters
 [**sonic_vrfs**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_vrfs_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-vrfs-module)| Manage VRFs and associate VRFs to interfaces
+[**sonic_vrrp**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_vrrp_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-vrrp-module)| Manage VRRP protocol configuration settings
 [**sonic_vxlans**](https://docs.ansible.com/ansible/latest/collections/dellemc/enterprise_sonic/sonic_vxlans_module.html#ansible-collections-dellemc-enterprise-sonic-sonic-vxlans-module)| Manage VxLAN EVPN and its parameters
 
 Sample use case playbooks
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
index 8b0d92009..d8ce42f7e 100644
--- a/changelogs/.plugin-cache.yaml
+++ b/changelogs/.plugin-cache.yaml
@@ -6,7 +6,7 @@ plugins:
   callback: {}
   cliconf:
     sonic:
-      description: Use sonic cliconf to run command on Dell OS10 platform
+      description: Use sonic cliconf to run command on Dell SONiC platforms
       name: sonic
       version_added: null
   connection: {}
@@ -104,6 +104,17 @@ plugins:
       name: sonic_facts
       namespace: ''
       version_added: 1.0.0
+    sonic_fips:
+      description: Manage FIPS configurations on SONiC
+      name: sonic_fips
+      namespace: ''
+      version_added: 2.1.0
+    sonic_image_management:
+      description: Manage installation of Enterprise SONiC image, software patch and
+        firmware updater
+      name: sonic_image_management
+      namespace: ''
+      version_added: 2.4.0
     sonic_interfaces:
       description: Configure Interface attributes on interfaces such as, Eth, LAG,
         VLAN, and loopback. (create a loopback interface if it does not exist.)
@@ -142,16 +153,31 @@ plugins:
       name: sonic_lag_interfaces
       namespace: ''
       version_added: 1.0.0
+    sonic_ldap:
+      description: Configure global LDAP server settings on SONiC.
+      name: sonic_ldap
+      namespace: ''
+      version_added: 3.0.0
     sonic_lldp_global:
       description: Manage Global LLDP configurations on SONiC
       name: sonic_lldp_global
       namespace: ''
       version_added: 2.1.0
+    sonic_lldp_interfaces:
+      description: Manage Inteface LLDP configurations on SONiC
+      name: sonic_lldp_interfaces
+      namespace: ''
+      version_added: 2.1.0
     sonic_logging:
       description: Manage logging configuration on SONiC.
       name: sonic_logging
       namespace: ''
       version_added: 2.1.0
+    sonic_login_lockout:
+      description: Manage Global Login Lockout configurations on SONiC
+      name: sonic_login_lockout
+      namespace: ''
+      version_added: 2.5.0
     sonic_mac:
       description: Manage MAC configuration on SONiC
       name: sonic_mac
@@ -163,16 +189,51 @@ plugins:
       name: sonic_mclag
       namespace: ''
       version_added: 1.0.0
+    sonic_mgmt_servers:
+      description: Manage management servers configuration on SONiC
+      name: sonic_mgmt_servers
+      namespace: ''
+      version_added: 2.5.0
     sonic_ntp:
       description: Manage NTP configuration on SONiC.
       name: sonic_ntp
       namespace: ''
       version_added: 2.0.0
+    sonic_ospf_area:
+      description: configure OSPF area settings on SONiC
+      name: sonic_ospf_area
+      namespace: ''
+      version_added: 2.5.0
+    sonic_ospfv2:
+      description: Configure global OSPFv2 protocol settings on SONiC.
+      name: sonic_ospfv2
+      namespace: ''
+      version_added: 2.5.0
+    sonic_ospfv2_interfaces:
+      description: Configure OSPFv2 interface mode protocol settings on SONiC.
+      name: sonic_ospfv2_interfaces
+      namespace: ''
+      version_added: 2.5.0
+    sonic_pim_global:
+      description: Manage global PIM configurations on SONiC
+      name: sonic_pim_global
+      namespace: ''
+      version_added: 2.5.0
+    sonic_pim_interfaces:
+      description: Manage interface-specific PIM configurations on SONiC
+      name: sonic_pim_interfaces
+      namespace: ''
+      version_added: 2.5.0
     sonic_pki:
       description: Manages PKI attributes of Enterprise Sonic
       name: sonic_pki
       namespace: ''
       version_added: 2.3.0
+    sonic_poe:
+      description: Manage PoE configuration on SONiC
+      name: sonic_poe
+      namespace: ''
+      version_added: 2.5.0
     sonic_port_breakout:
       description: Configure port breakout settings on physical interfaces
       name: sonic_port_breakout
@@ -188,16 +249,56 @@ plugins:
       name: sonic_prefix_lists
       namespace: ''
       version_added: 2.0.0
+    sonic_qos_buffer:
+      description: Manage QoS buffer configuration on SONiC
+      name: sonic_qos_buffer
+      namespace: ''
+      version_added: 2.5.0
+    sonic_qos_interfaces:
+      description: Manage QoS interfaces configuration on SONiC
+      name: sonic_qos_interfaces
+      namespace: ''
+      version_added: 2.5.0
+    sonic_qos_maps:
+      description: Manage QoS maps configuration on SONiC
+      name: sonic_qos_maps
+      namespace: ''
+      version_added: 2.5.0
+    sonic_qos_pfc:
+      description: Manage QoS PFC configuration on SONiC
+      name: sonic_qos_pfc
+      namespace: ''
+      version_added: 2.5.0
+    sonic_qos_scheduler:
+      description: Manage QoS scheduler configuration on SONiC
+      name: sonic_qos_scheduler
+      namespace: ''
+      version_added: 2.5.0
+    sonic_qos_wred:
+      description: Manage QoS WRED profiles configuration on SONiC
+      name: sonic_qos_wred
+      namespace: ''
+      version_added: 2.5.0
     sonic_radius_server:
       description: Manage RADIUS server and its parameters
       name: sonic_radius_server
       namespace: ''
       version_added: 1.0.0
+    sonic_roce:
+      description: Manage RoCE QoS configuration on SONiC
+      name: sonic_roce
+      namespace: ''
+      version_added: 2.5.0
     sonic_route_maps:
       description: route map configuration handling for SONiC
       name: sonic_route_maps
       namespace: ''
       version_added: 2.1.0
+    sonic_sflow:
+      description: configure sflow settings on SONiC
+      name: sonic_sflow
+      namespace: ''
+      version_added: 2.5.0
     sonic_static_routes:
       description: Manage static routes configuration on SONiC
       name: sonic_static_routes
@@ -239,6 +340,11 @@ plugins:
       name: sonic_vrfs
       namespace: ''
       version_added: 1.0.0
+    sonic_vrrp:
+      description: Configure VRRP protocol settings on SONiC.
+      name: sonic_vrrp
+      namespace: ''
+      version_added: 2.5.0
     sonic_vxlans:
       description: Manage VxLAN EVPN and its parameters
       name: sonic_vxlans
@@ -249,4 +355,4 @@ plugins:
   strategy: {}
   test: {}
   vars: {}
-version: 2.4.0
+version: 2.5.0
diff --git a/changelogs/fragments/299-mclag-session-vrf-support.yaml b/changelogs/archive_fragments/2.5.0/299-mclag-session-vrf-support.yaml
similarity index 100%
rename from changelogs/fragments/299-mclag-session-vrf-support.yaml
rename to changelogs/archive_fragments/2.5.0/299-mclag-session-vrf-support.yaml
diff --git a/changelogs/fragments/317-added-protocol-option-for-syslog-module.yaml b/changelogs/archive_fragments/2.5.0/317-added-protocol-option-for-syslog-module.yaml
similarity index 100%
rename from changelogs/fragments/317-added-protocol-option-for-syslog-module.yaml
rename to changelogs/archive_fragments/2.5.0/317-added-protocol-option-for-syslog-module.yaml
diff --git a/changelogs/fragments/328-playbook-check-diff-modes-for-l3-interfaces.yaml b/changelogs/archive_fragments/2.5.0/328-playbook-check-diff-modes-for-l3-interfaces.yaml
similarity index 100%
rename from changelogs/fragments/328-playbook-check-diff-modes-for-l3-interfaces.yaml
rename to changelogs/archive_fragments/2.5.0/328-playbook-check-diff-modes-for-l3-interfaces.yaml
diff --git a/changelogs/fragments/329-regression-test-automated-intf-naming-config.yaml b/changelogs/archive_fragments/2.5.0/329-regression-test-automated-intf-naming-config.yaml
similarity index 100%
rename from changelogs/fragments/329-regression-test-automated-intf-naming-config.yaml
rename to changelogs/archive_fragments/2.5.0/329-regression-test-automated-intf-naming-config.yaml
diff --git a/changelogs/fragments/330-add-external-ip-attribute-for-vxlan.yaml b/changelogs/archive_fragments/2.5.0/330-add-external-ip-attribute-for-vxlan.yaml
similarity index 100%
rename from changelogs/fragments/330-add-external-ip-attribute-for-vxlan.yaml
rename to changelogs/archive_fragments/2.5.0/330-add-external-ip-attribute-for-vxlan.yaml
diff --git a/changelogs/fragments/331-playbook-check-diff-modes-for-route_maps_prefix_lists.yaml b/changelogs/archive_fragments/2.5.0/331-playbook-check-diff-modes-for-route_maps_prefix_lists.yaml
similarity index 100%
rename from changelogs/fragments/331-playbook-check-diff-modes-for-route_maps_prefix_lists.yaml
rename to changelogs/archive_fragments/2.5.0/331-playbook-check-diff-modes-for-route_maps_prefix_lists.yaml
diff --git a/changelogs/fragments/335-replaced-overridden-for-bgp-neighbors-module.yaml b/changelogs/archive_fragments/2.5.0/335-replaced-overridden-for-bgp-neighbors-module.yaml
similarity index 100%
rename from changelogs/fragments/335-replaced-overridden-for-bgp-neighbors-module.yaml
rename to changelogs/archive_fragments/2.5.0/335-replaced-overridden-for-bgp-neighbors-module.yaml
diff --git a/changelogs/fragments/336-replaced-overridden-for-bgp-neighbors-af-module.yaml b/changelogs/archive_fragments/2.5.0/336-replaced-overridden-for-bgp-neighbors-af-module.yaml
similarity index 100%
rename from changelogs/fragments/336-replaced-overridden-for-bgp-neighbors-af-module.yaml
rename to changelogs/archive_fragments/2.5.0/336-replaced-overridden-for-bgp-neighbors-af-module.yaml
diff --git a/changelogs/fragments/337-playbook-check-diff-modes-for-mclag-port-breakout-vxlans.yaml b/changelogs/archive_fragments/2.5.0/337-playbook-check-diff-modes-for-mclag-port-breakout-vxlans.yaml
similarity index 100%
rename from changelogs/fragments/337-playbook-check-diff-modes-for-mclag-port-breakout-vxlans.yaml
rename to changelogs/archive_fragments/2.5.0/337-playbook-check-diff-modes-for-mclag-port-breakout-vxlans.yaml
diff --git a/changelogs/fragments/338-playbook-check-diff-modes-for-mac-stp-lldp.yaml b/changelogs/archive_fragments/2.5.0/338-playbook-check-diff-modes-for-mac-stp-lldp.yaml
similarity index 100%
rename from changelogs/fragments/338-playbook-check-diff-modes-for-mac-stp-lldp.yaml
rename to changelogs/archive_fragments/2.5.0/338-playbook-check-diff-modes-for-mac-stp-lldp.yaml
diff --git a/changelogs/fragments/342-system-auto-breakout-module.yaml b/changelogs/archive_fragments/2.5.0/342-system-auto-breakout-module.yaml
similarity index 100%
rename from changelogs/fragments/342-system-auto-breakout-module.yaml
rename to changelogs/archive_fragments/2.5.0/342-system-auto-breakout-module.yaml
diff --git a/changelogs/fragments/344-update-ut-config-requests-validation.yaml b/changelogs/archive_fragments/2.5.0/344-update-ut-config-requests-validation.yaml
similarity index 100%
rename from changelogs/fragments/344-update-ut-config-requests-validation.yaml
rename to changelogs/archive_fragments/2.5.0/344-update-ut-config-requests-validation.yaml
diff --git a/changelogs/fragments/346-playbook-check-diff-modes-for-bfd-copp-dhcps.yaml b/changelogs/archive_fragments/2.5.0/346-playbook-check-diff-modes-for-bfd-copp-dhcps.yaml
similarity index 100%
rename from changelogs/fragments/346-playbook-check-diff-modes-for-bfd-copp-dhcps.yaml
rename to changelogs/archive_fragments/2.5.0/346-playbook-check-diff-modes-for-bfd-copp-dhcps.yaml
diff --git a/changelogs/fragments/350-playbook-check-diff-modes-for-bgp-modules.yaml b/changelogs/archive_fragments/2.5.0/350-playbook-check-diff-modes-for-bgp-modules.yaml
similarity index 100%
rename from changelogs/fragments/350-playbook-check-diff-modes-for-bgp-modules.yaml
rename to changelogs/archive_fragments/2.5.0/350-playbook-check-diff-modes-for-bgp-modules.yaml
diff --git a/changelogs/fragments/351-bgp-af-import-vrf-support.yaml b/changelogs/archive_fragments/2.5.0/351-bgp-af-import-vrf-support.yaml
similarity index 100%
rename from changelogs/fragments/351-bgp-af-import-vrf-support.yaml
rename to changelogs/archive_fragments/2.5.0/351-bgp-af-import-vrf-support.yaml
diff --git a/changelogs/fragments/352-system-standard-extended-interface-naming.yaml b/changelogs/archive_fragments/2.5.0/352-system-standard-extended-interface-naming.yaml
similarity index 100%
rename from changelogs/fragments/352-system-standard-extended-interface-naming.yaml
rename to changelogs/archive_fragments/2.5.0/352-system-standard-extended-interface-naming.yaml
diff --git a/changelogs/fragments/354-prefix-lists-fix-replaced-idempotency.yaml b/changelogs/archive_fragments/2.5.0/354-prefix-lists-fix-replaced-idempotency.yaml
similarity index 100%
rename from changelogs/fragments/354-prefix-lists-fix-replaced-idempotency.yaml
rename to changelogs/archive_fragments/2.5.0/354-prefix-lists-fix-replaced-idempotency.yaml
diff --git a/changelogs/fragments/360-playbook-check-diff-modes-for-bgp-neighbors-and-af.yaml b/changelogs/archive_fragments/2.5.0/360-playbook-check-diff-modes-for-bgp-neighbors-and-af.yaml
similarity index 100%
rename from changelogs/fragments/360-playbook-check-diff-modes-for-bgp-neighbors-and-af.yaml
rename to changelogs/archive_fragments/2.5.0/360-playbook-check-diff-modes-for-bgp-neighbors-and-af.yaml
diff --git a/changelogs/fragments/364-interfaces-fix-loopback.yaml b/changelogs/archive_fragments/2.5.0/364-interfaces-fix-loopback.yaml
similarity index 100%
rename from changelogs/fragments/364-interfaces-fix-loopback.yaml
rename to changelogs/archive_fragments/2.5.0/364-interfaces-fix-loopback.yaml
diff --git a/changelogs/fragments/366-github-issue-357-fix.yaml b/changelogs/archive_fragments/2.5.0/366-github-issue-357-fix.yaml
similarity index 100%
rename from changelogs/fragments/366-github-issue-357-fix.yaml
rename to changelogs/archive_fragments/2.5.0/366-github-issue-357-fix.yaml
diff --git a/changelogs/fragments/373-qos-scheduler-update-states.yaml b/changelogs/archive_fragments/2.5.0/373-qos-scheduler-update-states.yaml
similarity index 100%
rename from changelogs/fragments/373-qos-scheduler-update-states.yaml
rename to changelogs/archive_fragments/2.5.0/373-qos-scheduler-update-states.yaml
diff --git a/changelogs/fragments/374-usgv6r1-related-features-support.yaml b/changelogs/archive_fragments/2.5.0/374-usgv6r1-related-features-support.yaml
similarity index 100%
rename from changelogs/fragments/374-usgv6r1-related-features-support.yaml
rename to changelogs/archive_fragments/2.5.0/374-usgv6r1-related-features-support.yaml
diff --git a/changelogs/fragments/377-interfaces-vlans-fix-facts.yaml b/changelogs/archive_fragments/2.5.0/377-interfaces-vlans-fix-facts.yaml
similarity index 100%
rename from changelogs/fragments/377-interfaces-vlans-fix-facts.yaml
rename to changelogs/archive_fragments/2.5.0/377-interfaces-vlans-fix-facts.yaml
diff --git a/changelogs/fragments/381-fix-copp-states.yaml b/changelogs/archive_fragments/2.5.0/381-fix-copp-states.yaml
similarity index 100%
rename from changelogs/fragments/381-fix-copp-states.yaml
rename to changelogs/archive_fragments/2.5.0/381-fix-copp-states.yaml
diff --git a/changelogs/fragments/383-fix-state-implementation.yaml b/changelogs/archive_fragments/2.5.0/383-fix-state-implementation.yaml
similarity index 100%
rename from changelogs/fragments/383-fix-state-implementation.yaml
rename to changelogs/archive_fragments/2.5.0/383-fix-state-implementation.yaml
diff --git a/changelogs/fragments/384-add-route-maps-ut.yaml b/changelogs/archive_fragments/2.5.0/384-add-route-maps-ut.yaml
similarity index 100%
rename from changelogs/fragments/384-add-route-maps-ut.yaml
rename to changelogs/archive_fragments/2.5.0/384-add-route-maps-ut.yaml
diff --git a/changelogs/fragments/388-system-update-replaced-state.yaml b/changelogs/archive_fragments/2.5.0/388-system-update-replaced-state.yaml
similarity index 100%
rename from changelogs/fragments/388-system-update-replaced-state.yaml
rename to changelogs/archive_fragments/2.5.0/388-system-update-replaced-state.yaml
diff --git a/changelogs/fragments/391-fix-qos-pfc-bug.yaml b/changelogs/archive_fragments/2.5.0/391-fix-qos-pfc-bug.yaml
similarity index 100%
rename from changelogs/fragments/391-fix-qos-pfc-bug.yaml
rename to changelogs/archive_fragments/2.5.0/391-fix-qos-pfc-bug.yaml
diff --git a/changelogs/fragments/393-github-issue-376-fix.yaml b/changelogs/archive_fragments/2.5.0/393-github-issue-376-fix.yaml
similarity index 100%
rename from changelogs/fragments/393-github-issue-376-fix.yaml
rename to changelogs/archive_fragments/2.5.0/393-github-issue-376-fix.yaml
diff --git a/changelogs/fragments/394-update-version-remove-facts-reports.yaml b/changelogs/archive_fragments/2.5.0/394-update-version-remove-facts-reports.yaml
similarity index 100%
rename from changelogs/fragments/394-update-version-remove-facts-reports.yaml
rename to changelogs/archive_fragments/2.5.0/394-update-version-remove-facts-reports.yaml
diff --git a/changelogs/fragments/395-comment-out-pfc-pg-test-cases.yaml b/changelogs/archive_fragments/2.5.0/395-comment-out-pfc-pg-test-cases.yaml
similarity index 100%
rename from changelogs/fragments/395-comment-out-pfc-pg-test-cases.yaml
rename to changelogs/archive_fragments/2.5.0/395-comment-out-pfc-pg-test-cases.yaml
diff --git a/changelogs/fragments/396-port-group-facts-enhancement.yaml b/changelogs/archive_fragments/2.5.0/396-port-group-facts-enhancement.yaml
similarity index 100%
rename from changelogs/fragments/396-port-group-facts-enhancement.yaml
rename to changelogs/archive_fragments/2.5.0/396-port-group-facts-enhancement.yaml
diff --git a/changelogs/fragments/398-bgp-af-aggregate-address-support.yaml b/changelogs/archive_fragments/2.5.0/398-bgp-af-aggregate-address-support.yaml
similarity index 100%
rename from changelogs/fragments/398-bgp-af-aggregate-address-support.yaml
rename to changelogs/archive_fragments/2.5.0/398-bgp-af-aggregate-address-support.yaml
diff --git a/changelogs/fragments/400-bgp-af-update-replaced-state.yaml b/changelogs/archive_fragments/2.5.0/400-bgp-af-update-replaced-state.yaml
similarity index 100%
rename from changelogs/fragments/400-bgp-af-update-replaced-state.yaml
rename to changelogs/archive_fragments/2.5.0/400-bgp-af-update-replaced-state.yaml
diff --git a/changelogs/fragments/401-versatile-hash.yaml b/changelogs/archive_fragments/2.5.0/401-versatile-hash.yaml
similarity index 100%
rename from changelogs/fragments/401-versatile-hash.yaml
rename to changelogs/archive_fragments/2.5.0/401-versatile-hash.yaml
diff --git a/changelogs/fragments/403-lag-interface-evpn-ethernet-segment.yaml b/changelogs/archive_fragments/2.5.0/403-lag-interface-evpn-ethernet-segment.yaml
similarity index 100%
rename from changelogs/fragments/403-lag-interface-evpn-ethernet-segment.yaml
rename to changelogs/archive_fragments/2.5.0/403-lag-interface-evpn-ethernet-segment.yaml
diff --git a/changelogs/fragments/405-auditd-config.yaml b/changelogs/archive_fragments/2.5.0/405-auditd-config.yaml
similarity index 100%
rename from changelogs/fragments/405-auditd-config.yaml
rename to changelogs/archive_fragments/2.5.0/405-auditd-config.yaml
diff --git a/changelogs/fragments/410-sonic_l2_interfaces-fix-facts-exception.yaml b/changelogs/archive_fragments/2.5.0/410-sonic_l2_interfaces-fix-facts-exception.yaml
similarity index 100%
rename from changelogs/fragments/410-sonic_l2_interfaces-fix-facts-exception.yaml
rename to changelogs/archive_fragments/2.5.0/410-sonic_l2_interfaces-fix-facts-exception.yaml
diff --git a/changelogs/fragments/413-route-maps-set-tag-support-and-doc-updates.yaml b/changelogs/archive_fragments/2.5.0/413-route-maps-set-tag-support-and-doc-updates.yaml
similarity index 100%
rename from changelogs/fragments/413-route-maps-set-tag-support-and-doc-updates.yaml
rename to changelogs/archive_fragments/2.5.0/413-route-maps-set-tag-support-and-doc-updates.yaml
diff --git a/changelogs/fragments/417-bgp-asn-notation.yaml b/changelogs/archive_fragments/2.5.0/417-bgp-asn-notation.yaml
similarity index 100%
rename from changelogs/fragments/417-bgp-asn-notation.yaml
rename to changelogs/archive_fragments/2.5.0/417-bgp-asn-notation.yaml
diff --git a/changelogs/fragments/418-github-issue-416-fix.yaml b/changelogs/archive_fragments/2.5.0/418-github-issue-416-fix.yaml
similarity index 100%
rename from changelogs/fragments/418-github-issue-416-fix.yaml
rename to changelogs/archive_fragments/2.5.0/418-github-issue-416-fix.yaml
diff --git a/changelogs/fragments/422-update-ut-for-bgp-neighbors.yaml b/changelogs/archive_fragments/2.5.0/422-update-ut-for-bgp-neighbors.yaml
similarity index 100%
rename from changelogs/fragments/422-update-ut-for-bgp-neighbors.yaml
rename to changelogs/archive_fragments/2.5.0/422-update-ut-for-bgp-neighbors.yaml
diff --git a/changelogs/fragments/428-l3-interfaces-default-dad-fix.yaml b/changelogs/archive_fragments/2.5.0/428-l3-interfaces-default-dad-fix.yaml
similarity index 100%
rename from changelogs/fragments/428-l3-interfaces-default-dad-fix.yaml
rename to changelogs/archive_fragments/2.5.0/428-l3-interfaces-default-dad-fix.yaml
diff --git a/changelogs/fragments/429-cliconf-doc-fix.yaml b/changelogs/archive_fragments/2.5.0/429-cliconf-doc-fix.yaml
similarity index 100%
rename from changelogs/fragments/429-cliconf-doc-fix.yaml
rename to changelogs/archive_fragments/2.5.0/429-cliconf-doc-fix.yaml
diff --git a/changelogs/fragments/431-l3-interfaces-fix-replaced-state.yaml b/changelogs/archive_fragments/2.5.0/431-l3-interfaces-fix-replaced-state.yaml
similarity index 100%
rename from changelogs/fragments/431-l3-interfaces-fix-replaced-state.yaml
rename to changelogs/archive_fragments/2.5.0/431-l3-interfaces-fix-replaced-state.yaml
diff --git a/changelogs/archive_fragments/2.5.0/432-changelogs-v2.5.0-release-note.yaml b/changelogs/archive_fragments/2.5.0/432-changelogs-v2.5.0-release-note.yaml
new file mode 100644
index 000000000..69d67ff9d
--- /dev/null
+++ b/changelogs/archive_fragments/2.5.0/432-changelogs-v2.5.0-release-note.yaml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - changelogs - Provide changelog updates for release 2.5.0 (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/432).
diff --git a/changelogs/archive_fragments/2.5.0/v2.5.0_summary.yaml b/changelogs/archive_fragments/2.5.0/v2.5.0_summary.yaml
new file mode 100644
index 000000000..5c6aa4326
--- /dev/null
+++ b/changelogs/archive_fragments/2.5.0/v2.5.0_summary.yaml
@@ -0,0 +1,16 @@
+release_summary: |
+        | Release Date: 2024-0812
+        |
+        | This release provides enhanced Dell Enterprise SONiC Ansible Collection support for SONiC 4.x images.
+        | In addition to new resource modules to support previously existing functionality, it provides
+        | support for several new features released in SONiC releases 4.1, 4.2, and 4.4.
+        | It also provides bug fixes and enhancements for support of features that were initially introduced
+        | in previous Enterprise SONiC Ansible releases. The changelog describes changes made to the modules
+        | included in this collection since release 2.0.0.
+        |
+        | Additional details are described below.
+        | 1) Update the "requires_ansible" version in the meta/runtime.yml file for this collection
+        | to the oldest supported version of ansible-core. (This was recently changed by Redhat/Ansible
+        | to version "2.15.0".)
+        | 2) Update the list of resource modules in the README file to include all currently available
+        | resource modules for this collection.
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 6c6dd1b91..ca6666ff8 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -721,3 +721,233 @@ releases:
     - 322-docs-README-updates.yaml
     - v2.4.0_summary.yaml
     release_date: '2024-01-08'
+  2.5.0:
+    changes:
+      bugfixes:
+      - sonic_bfd - Fix BFD states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+      - sonic_bgp_neighbors - Fix issues with deleted state (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/335).
+      - sonic_copp - Fix CoPP states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/381).
+      - sonic_interfaces - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/377).
+      - sonic_interfaces - Fix replaced and overridden state handling for Loopback
+        interfaces (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+      - sonic_l2_interfaces - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/410).
+      - sonic_l3_interfaces - Fix replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/431).
+      - sonic_mac - Fix MAC states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+      - sonic_prefix_lists - Fix idempotency failure (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/354).
+      - sonic_prefix_lists - Fix replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/354).
+      - sonic_qos_pfc - Add back accidentally deleted line of code  (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/391).
+      - sonic_static_routes - Fix static routes states implementation bug (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/383).
+      - sonic_vlans - Fix exception when gathering facts (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/377).
+      minor_changes:
+      - bgp_af - Add support for 'import vrf' commands (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/351).
+      - sonic_bfd - Add playbook check and diff modes support for bfd module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+      - sonic_bgp - Add playbook check and diff modes support for bgp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+      - sonic_bgp - Add support BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+      - sonic_bgp - Fix GitHub issue# 416 (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/418).
+      - sonic_bgp_af - Add playbook check and diff modes support for bgp_af module
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+      - sonic_bgp_af - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+      - sonic_bgp_af - Add support for aggregate address configuration(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/398).
+      - sonic_bgp_af - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/400)
+      - sonic_bgp_as_paths - Add playbook check and diff modes support for bgp_as_paths
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+      - sonic_bgp_communities - Add playbook check and diff modes support for bgp_communities
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+      - sonic_bgp_ext_communities - Add playbook check and diff modes support for
+        bgp_ext_communities module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/350).
+      - sonic_bgp_neighbors - Add playbook check and diff modes support for bgp_neighbors
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/360).
+      - sonic_bgp_neighbors - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+      - sonic_bgp_neighbors - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/335).
+      - sonic_bgp_neighbors - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/336).
+      - sonic_bgp_neighbors - Add support for the "fabric_external" option (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/336).
+      - sonic_bgp_neighbors_af - Add playbook check and diff modes support for bgp_neighbors_af
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/360).
+      - sonic_bgp_neighbors_af - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+      - sonic_copp - Add playbook check and diff modes support for copp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+      - sonic_dhcp_relay - Add playbook check and diff modes support for dhcp_relay
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+      - sonic_dhcp_snooping - Add playbook check and diff modes support for dhcp_snooping
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/346).
+      - sonic_interfaces - Add description, enabled option support for Loopback interfaces
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+      - sonic_interfaces - Fix GitHub issue 357 - set proper default value when deleted
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/366).
+      - sonic_interfaces - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/364).
+      - sonic_l3_interfaces - Add playbook check and diff modes support for l3_interfaces
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/328).
+      - sonic_l3_interfaces - Add support for USGv6R1 related features (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/374).
+      - sonic_l3_interfaces - Fix IPv6 default dad configuration handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/428).
+      - sonic_lag_interfaces - Add evpn ethernet-segment support for LAG interfaces
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/403).
+      - sonic_lldp_global - Add playbook check and diff modes support for lldp_global
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+      - sonic_logging - Add support for protocol option in logging module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/317).
+      - sonic_mac - Add playbook check and diff modes support for mac module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+      - sonic_mclag - Add playbook check and diff modes support for mclag module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+      - sonic_mclag - Enable session-vrf command support in mclag(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/299).
+      - sonic_port_breakout - Add playbook check and diff modes support for port_breakout
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+      - sonic_port_group - Make error message for port group facts gathering more
+        descriptive (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/396).
+      - sonic_prefix_lists - Add playbook check and diff modes support for prefix_lists
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/331).
+      - sonic_qos_maps - Comment out PFC priority group map tests cases (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/395).
+      - sonic_qos_scheduler - Update states implementation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/373).
+      - sonic_route_maps - Add UT for route maps module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/384).
+      - sonic_route_maps - Add playbook check and diff modes support for route_maps
+        module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/331).
+      - sonic_route_maps - Add support for BGP Asn Notation (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/417).
+      - sonic_route_maps - Add support for the 'set tag' option and synchronize module
+        documentation with argspec and model (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/413).
+      - sonic_stp - Add playbook check and diff modes support for stp module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/338).
+      - sonic_system - Add support for 'standard_extended' interface-naming mode (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/352).
+      - sonic_system - Add support for configuring auto-breakout feature (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/342).
+      - sonic_system - Adding Versatile Hash feature.(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/401).
+      - sonic_system - Enable auditd command support(https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/405).
+      - sonic_system - Update replaced state handling (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/388).
+      - sonic_vxlan - Fix GitHub issue 376 - Change vxlan module get_fact function
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/393).
+      - sonic_vxlans - Add playbook check and diff modes support for vxlans module
+        (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/337).
+      - sonic_vxlans - Add support for the "external_ip" vxlan option (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/330).
+      release_summary: '| Release Date: 2024-0812
+
+        |
+
+        | This release provides enhanced Dell Enterprise SONiC Ansible Collection
+        support for SONiC 4.x images.
+
+        | In addition to new resource modules to support previously existing functionality,
+        it provides
+
+        | support for several new features released in SONiC releases 4.1, 4.2, and
+        4.4.
+
+        | It also provides bug fixes and enhancements for support of features that
+        were initially introduced
+
+        | in previous Enterprise SONiC Ansible releases. The changelog describes changes
+        made to the modules
+
+        | included in this collection since release 2.0.0.
+
+        |
+
+        | Additional details are described below.
+
+        | 1) Update the "requires_ansible" version in the meta/runtime.yml file for
+        this collection
+
+        | to the oldest supported version of ansible-core. (This was recently changed
+        by Redhat/Ansible
+
+        | to version "2.15.0".)
+
+        | 2) Update the list of resource modules in the README file to include all
+        currently available
+
+        | resource modules for this collection.
+
+        '
+    fragments:
+    - 299-mclag-session-vrf-support.yaml
+    - 317-added-protocol-option-for-syslog-module.yaml
+    - 328-playbook-check-diff-modes-for-l3-interfaces.yaml
+    - 329-regression-test-automated-intf-naming-config.yaml
+    - 330-add-external-ip-attribute-for-vxlan.yaml
+    - 331-playbook-check-diff-modes-for-route_maps_prefix_lists.yaml
+    - 335-replaced-overridden-for-bgp-neighbors-module.yaml
+    - 336-replaced-overridden-for-bgp-neighbors-af-module.yaml
+    - 337-playbook-check-diff-modes-for-mclag-port-breakout-vxlans.yaml
+    - 338-playbook-check-diff-modes-for-mac-stp-lldp.yaml
+    - 342-system-auto-breakout-module.yaml
+    - 344-update-ut-config-requests-validation.yaml
+    - 346-playbook-check-diff-modes-for-bfd-copp-dhcps.yaml
+    - 350-playbook-check-diff-modes-for-bgp-modules.yaml
+    - 351-bgp-af-import-vrf-support.yaml
+    - 352-system-standard-extended-interface-naming.yaml
+    - 354-prefix-lists-fix-replaced-idempotency.yaml
+    - 360-playbook-check-diff-modes-for-bgp-neighbors-and-af.yaml
+    - 364-interfaces-fix-loopback.yaml
+    - 366-github-issue-357-fix.yaml
+    - 373-qos-scheduler-update-states.yaml
+    - 374-usgv6r1-related-features-support.yaml
+    - 377-interfaces-vlans-fix-facts.yaml
+    - 381-fix-copp-states.yaml
+    - 383-fix-state-implementation.yaml
+    - 384-add-route-maps-ut.yaml
+    - 388-system-update-replaced-state.yaml
+    - 391-fix-qos-pfc-bug.yaml
+    - 393-github-issue-376-fix.yaml
+    - 394-update-version-remove-facts-reports.yaml
+    - 395-comment-out-pfc-pg-test-cases.yaml
+    - 396-port-group-facts-enhancement.yaml
+    - 398-bgp-af-aggregate-address-support.yaml
+    - 400-bgp-af-update-replaced-state.yaml
+    - 401-versatile-hash.yaml
+    - 403-lag-interface-evpn-ethernet-segment.yaml
+    - 405-auditd-config.yaml
+    - 410-sonic_l2_interfaces-fix-facts-exception.yaml
+    - 413-route-maps-set-tag-support-and-doc-updates.yaml
+    - 417-bgp-asn-notation.yaml
+    - 418-github-issue-416-fix.yaml
+    - 422-update-ut-for-bgp-neighbors.yaml
+    - 428-l3-interfaces-default-dad-fix.yaml
+    - 429-cliconf-doc-fix.yaml
+    - 431-l3-interfaces-fix-replaced-state.yaml
+    - 432-changelogs-v2.5.0-release-note.yaml
+    - v2.5.0_summary.yaml
+    modules:
+    - description: Manage Global Login Lockout configurations on SONiC.
+      name: sonic_login_lockout
+      namespace: ''
+    - description: Manage management servers configuration on SONiC.
+      name: sonic_mgmt_servers
+      namespace: ''
+    - description: configure OSPF area settings on SONiC.
+      name: sonic_ospf_area
+      namespace: ''
+    - description: Configure global OSPFv2 protocol settings on SONiC.
+      name: sonic_ospfv2
+      namespace: ''
+    - description: Configure OSPFv2 interface mode protocol settings on SONiC.
+      name: sonic_ospfv2_interfaces
+      namespace: ''
+    - description: Manage global PIM configurations on SONiC.
+      name: sonic_pim_global
+      namespace: ''
+    - description: Manage interface-specific PIM configurations on SONiC.
+      name: sonic_pim_interfaces
+      namespace: ''
+    - description: Manage PoE configuration on SONiC.
+      name: sonic_poe
+      namespace: ''
+    - description: Manage QoS buffer configuration on SONiC.
+      name: sonic_qos_buffer
+      namespace: ''
+    - description: Manage QoS interfaces configuration on SONiC.
+      name: sonic_qos_interfaces
+      namespace: ''
+    - description: Manage QoS maps configuration on SONiC.
+      name: sonic_qos_maps
+      namespace: ''
+    - description: Manage QoS PFC configuration on SONiC.
+      name: sonic_qos_pfc
+      namespace: ''
+    - description: Manage QoS scheduler configuration on SONiC.
+      name: sonic_qos_scheduler
+      namespace: ''
+    - description: Manage QoS WRED profiles configuration on SONiC.
+      name: sonic_qos_wred
+      namespace: ''
+    - description: Manage RoCE QoS configuration on SONiC.
+      name: sonic_roce
+      namespace: ''
+    - description: configure sflow settings on SONiC.
+      name: sonic_sflow
+      namespace: ''
+    - description: Configure VRRP protocol settings on SONiC.
+      name: sonic_vrrp
+      namespace: ''
+    release_date: '2024-08-13'
diff --git a/changelogs/config.yaml b/changelogs/config.yaml
index 158fea109..071d27cf1 100644
--- a/changelogs/config.yaml
+++ b/changelogs/config.yaml
@@ -1,5 +1,8 @@
+add_plugin_period: true
 changelog_filename_template: ../CHANGELOG.rst
 changelog_filename_version_depth: 0
+changelog_nice_yaml: false
+changelog_sort: alphanumerical
 changes_file: changelog.yaml
 changes_format: combined
 ignore_other_fragment_extensions: true
@@ -8,6 +11,8 @@ archive_path_template: changelogs/archive_fragments/{version}
 mention_ancestor: true
 new_plugins_after_name: removed_features
 notesdir: fragments
+output_formats:
+- rst
 prelude_section_name: release_summary
 prelude_section_title: Release Summary
 sanitize_changelog: true
diff --git a/galaxy.yml b/galaxy.yml
index 5f598df83..b46f97222 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: dellemc
 name: enterprise_sonic
-version: 2.4.0
+version: 2.5.0
 readme: README.md
 authors:
 - Senthil Kumar Ganesan <Senthil_Kumar_Ganesa@Dell.com>
diff --git a/meta/runtime.yml b/meta/runtime.yml
index 877679f24..84fb234fe 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,4 +1,4 @@
-requires_ansible: '>=2.14.0'
+requires_ansible: '>=2.15.0'
 plugin_routing:
   action:
     sonic_config:
diff --git a/tests/regression/hosts b/tests/regression/hosts
index f2fd8da12..eb3fd75ff 100644
--- a/tests/regression/hosts
+++ b/tests/regression/hosts
@@ -8,6 +8,6 @@ sonic2
 
 [datacenter:vars]
 ansible_network_os=dellemc.enterprise_sonic.sonic
-ansible_python_interpreter=/usr/bin/python3.9
+ansible_python_interpreter=/usr/bin/python3.11
 ansible_httpapi_use_ssl=true
 ansible_httpapi_validate_certs=false
diff --git a/tests/regression/test.yaml b/tests/regression/test.yaml
index 7e9cf7fed..87c657c77 100644
--- a/tests/regression/test.yaml
+++ b/tests/regression/test.yaml
@@ -68,6 +68,7 @@
     - sonic_pim_global
     - sonic_pim_interfaces
     - sonic_login_lockout
+    - sonic_ospf_area
     - sonic_poe
     - sonic_mgmt_servers
     - test_reports