#5679
#5679
Merge pull request #5721 from dotCMS/upgrade-task-5679

#5679