Code

Merge branch 'jk/maint-add--interactive-delete' into maint