Merge "BUG-650: remove unneeded sort()"