SONAR-5137 Fix stuff lost in the merge - see d2074c3527fab592cd65e91d7e2286075f8f3e0b