Split out opaque collection from from type_of
#111862
+303
−305
Merged