Merge "Modifies serialization for new VAB serialization schema"