SONAR-4282 Improve Action Plan WS