Merge change 20343

* changes:
  Sort the results of findleaves.