#5950
Merge pull request #5952 from dotCMS/merge-5950-to-master

#5950