Merge "Use User::equals() where applicable in the class"