SONAR-4315 Improve ActionService