Merge "Improve the dump code."