Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev