support sonar-3.5