Merge "Fix overflow/underflow problem in comparison"