#4682
Merge pull request #4697 from dotCMS/merge-4682-to-master

#4682