#3597 2.5 merge
#3597 2.5 merge
Merge pull request #3625 from dotCMS/issue-3597-master25

Issue 3597 master25