Merge "MR_ClientService-replace type with diamonds"