Merge "Fix channels --stats dump" into pi-dev