#5733
Merge pull request #5760 from dotCMS/merge-5733-to-master

#5733