Merge "Do not literally compare referenced_type of class fields" into main