Bug/testdata corruption

Merged Emmanuel Promayon requested to merge bug/testdata-corruption into develop

Merge request reports