Merge "Fix for sonar job"