#5728
Merge pull request #5764 from dotCMS/merge-5728-to-master

#5728