Merge "TopicService: Fixed sonar issue"