DDF-948: Added Cancel options for workspace edits