Merge branch feature/xml_serialization with refs/heads/master into refs/merge-requests/11/train

1 job for !11 with feature/xml_serialization into master in 3 minutes and 1 second
merge train