Merge "Fix sonar issue."