Merge "Update server details before getting fixed IP"