Fix OOIION-1258: Edit support for Deployment