Integration 2020 wk38

Merged Remi Hardy requested to merge integration_2020_wk38 into develop
Edited by Remi Hardy

Merge request reports