MBS-5723: Allow sorting collections by any column
Merge branch 'collection-sorting' into beta

* collection-sorting:
  MBS-5723: Allow sorting collections by any column