SONAR-3677 Improve API