Merge branch 'jk/push-to-delete'