merge to 2.3 #2931
Merge pull request #3004 from dotCMS/issue-2931-merge-to-master-2.3

merge to 2.3 #2931