Merge "Fix pmsh sonar job"