Merge "Fixed Sonar issue"