* FIX: Verify vs non-destructive delete
Merge branch 'master' into debug