Merge pull request #4754 from koying/fixsetsdelete