SONAR-2574 new API + ability to fork