Merge "Fixed invalid comparisons which were identified by Eclipse IDE 2018-09"