Updating for hotfix. fix pending_delete issue