merge 'sorted' change into trunk.