Merge "Test updating FIP with a different port"