SONAR-4908 fix backward-compatibility