merge #3370 to 2.5
Merge pull request #3385 from dotCMS/merge-3379-to-2.5

merge #3379 to 2.5