SONAR-5329 - Missing merge