Improve logging and debugging on deletes.
Merge remote-tracking branch 'origin/feature/improvedClient' into feature/improvedClient