Sort sets by cycle number first, then code.
Merge remote-tracking branch 'upstream/master'