Merged JSON Serialization features into Master