#5729
#5729
#5729
Merging into master changes made for #5729 #5839 #5841 #5842
Merging into master changes made for #5729 #5839 #5841 #5842
Merging into master changes made for #5729 #5839 #5841 #5842
#5862 for master
#5863 for master
#5729
#5729
#5876 for master
#5729
#5729
#5729
#5729
#5729
fixed merge for #5729
Merge pull request #5838 from dotCMS/merge-5729-to-master

Merge 5729 to master