Fixes #4554
Fixes #4554
Merge branch 'release-2.5.2' of github.com:dotCMS/dotCMS into release-2.5.2