Merge "Fix sonar issues"