#3849 merged in master
Merge pull request #3893 from dotCMS/issue-3849-master-merge

#3849 merged in master