b/15406376 p/72534700 Fixing multitype modal single polymorphic mapper case