Merge "Fix deletion from editor"