OOIION-1262: Edit support for external dataset agent/instance /REL2.0