Merge "Fix defered type creation when loading from A3D."