b3a11eca0f
* Remove deprecated LibrarySort
* Apply suggestions from code review
(cherry picked from commit 58acf0a8aa)