Merge pull request #7769 from remitamine/sort