Merge "Clean up resource correctly when client died." into tm-dev