merge #4924 to master
Merge pull request #4939 from dotCMS/merge-4924-to-master

merge #4924 to master