DC/vishnu | #3962 | moving the edit related changes from generic components