Merge "Incorrect result of compareTo between empty and non-empty strings"