Merge "Fix sonar code smells"