Merge "Fix sonar job"