Merge "IssueFix-Replace type with diamonds"