Merge "BUG-1902: reuse ConcreteTypeImpl instances"