Merge branch 'Issue-2389609' into 7.x-1.x
Issue #2393563 by eshta: Refactor validation functions for personalize elements.
Merge branch 'Issue-2393563' into RC