#5875
Merge pull request #5889 from dotCMS/last-changes-5875

#5875