Merge "make 'server' as 'required' in server update schema"