Merge "Fix IP handling in DerivativeRequest"