Merge "Clean up DumpData-related functions" into pi-dev