Merge from GM-Serialize