Merge commit '31c6e76add3d40b2954dd8adbb572d6c2520b707' into SOAP-Serialization
Merge branch 'SOAP-Serialization'