Merge "TopicService-replace type with diamonds"