Merge "Fix sonar code smell"