Merge "Fixed mClientState dump." into pi-dev