#5909
Merge pull request #5914 from dotCMS/merge-5909-to-master

#5909