Merge branch 'Issue-2393563' into 7.x-1.x
Merge branch 'Issue-2393925' into 7.x-1.x
Issue #2393929: Do not filter html content from users with the advanced personalize elements permission
Merge branch 'Issue-2393929' into RC