Patch for 3.2.x, 3.4.x IP identifier regression