SONAR-4421 Improve plan action