Merge "Make sure server response doesn't exceed maximum allowable length" into pi-dev