Merge "Use tag to avoid message Id conflict" into sc-dev