Update serialization from develop.