Fix double delete by ignoring the problem.
Merge branch 'dev/double-delete'.