Merge remote-tracking branch 'origin/master' into fix-nps-table-sort

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -9,6 +9,9 @@ Enterprise Fixes:
 - [surveys] Change question map log to debug log
 - [surveys] Sort widgets by internal name and search by name or internal name
 
+Enterprise Fixes:
+- [data-manager] Fixed bug when merging events with ampersand symbol in the name
+
 Dependencies:
 - Bump axios from 1.12.2 to 1.13.1 in /plugins/cognito
 - Bump csvtojson from 1.1.12 to 2.0.14
@@ -30,7 +33,6 @@ Enterprise Fixes:
 - [ab-testing] Add script for fixing variant cohort
 - [groups] Fix user permission update after updating user group permission
 
-
 ## Version 25.03.24
 Fixes:
 - [jobs] Fix condition for scheduling alert job