Merged GM-Serialize Branch, v1.0.7