Merge branch 'dm/add-i-edit-abort'