SONAR-5718 Add an unplanned option