Fix/paranoia soft delete#6854

compwron merged 3 commits intorubyforgood:mainrubyforgood/casa:mainfrom

alanparmenter:fix/paranoia-soft-deletealanparmenter/casa:fix/paranoia-soft-deleteCopy head branch name to clipboard