Story 56157964: Fixing cases where Directive is not set for Control when editing