#3873
Merge pull request #3877 from dotCMS/issue-3873-move-3837-fixes-to-master-2-5

#3873