re #7356 sort version 2 as well