Merge "TopicService authorization check refactor"