Update from review.
Merge branch 'sortRequires' into sortedRequires