APOLLO-2702 Plugged in formatting on serialize/deserialize