Merge "Fix potential issue with adding a fixed ip"