Merge pull request #3115 from moisesbr-dw/sort-with-collator