merge #5311 and #5312 to master
Merge pull request #5350 from dotCMS/merge-5311-to-master

merge #5311 and #5312 to master