Merge "Make logging much less verbose" into pi-dev