Modified unique IP test.
Merge fixup
Fix merge