Merge "Fix issue with leaking death recipients" into tm-qpr-dev