Merge pull request #10082 from annando/deletions