[579037] Avoid assuming custom PrimitiveTypes
8 files changed