3ef760604b
Note that classifier.underlyingType is always non-nullable, but abbreviation might be nullable, so we should keep them consistent ^KT-40199 Fixed