Merge "fix sonar issue"