Merge branch 'edit-as-new-fix'