Merge branch 'create-shadow-types-for-struct_ops-maps-in-skeletons'