Add better overflow safety in resend
Include IAs in Request to be more compatible with some servers
Merge remote-tracking branch 'up/master' into hnet
Fix including PD in request
Merge remote-tracking branch 'up/master' into hnet