#5077
Merge pull request #5595 from dotCMS/merge-5077-to-master

#5077