#5720
Merge pull request #5737 from dotCMS/merge-5720-to-master

#5720