Merge "Fix sonar issue"