Merge "Fix dump formatting." into pi-dev