Merge branch improve/xml_deserialization_test with refs/heads/master into refs/merge-requests/62/train