[#31957] Use UCM in ordering form field. Fix #1943
[#31187] Tag Cloud Layout for Popular Tags. Fix #1955
Merge remote-tracking branch 'upstream/master' into jlayoutsocial