Campos de endereço IP problemáticos

Very good, @sam can review these and make the call on 2.0 versus 2.1 depending on risk.