#4334 try again and again
Merge pull request #4350 from dotCMS/issue-4334-very-hard-merge

#4334 try again and again