Bug/643/add to edit mode