Merge "Fix bugs related to type-matching for shared Maps, Collections, Enums"