Merge branch '2100-some-of-the-example-archive-cannot-be-parsed-anymore' into 'develop'
Resolve "Some of the example archive cannot be parsed anymore" See merge request !2130
Resolve "Some of the example archive cannot be parsed anymore" See merge request !2130