Merge "Do not leak dump objects." into rvc-d1-dev