Story 56157964: Fixing cases where Directive is not set for Control when editing
Merge pull request #287 from reciprocity/feature/no-directive-controls

Control edit modal fix (#56157964)