Cherry picking various changes from client_server_fields (fixes various serialization layout compile errors)