Merge "modify Sonar Issue"