Merge "Additional fix for coversion from type-id to type-string."