fixes #5625 in master 3.0
Merge pull request #5650 from dotCMS/merge-5625-into-master-3-0

fixes #5625 in master 3.0