Merge "BUG-2159: fix sort() conflict"