Merge "sonar fix:Message Handling"