Merge Serialization.Json into main project
Some build warning fixes