Merge "Fix sonar issue: Override "equals(Object obj)""