#5605
Merge pull request #5641 from dotCMS/merge-5605-to-master-2.5

#5605