mergin #3560 to master-2.5
Merge pull request #4078 from dotCMS/merge-3560-to-2.5

Merge 3560 to 2.5