#3156 patch for master-2.5
Merge pull request #3168 from dotCMS/issue-3156-merge-2.5

#3156 patch for master-2.5