Merge branch fix/xml_serialization with refs/heads/master into refs/merge-requests/21/train

1 job for !21 with fix/xml_serialization into master in 3 minutes and 30 seconds
merge train