Merge branch 'jc/add-2.0-delete-default' (early part)