Feature/optional boolean flag for unique deletes

Merge radar/paranoia upstream edits