Merge branch 'hotfix_exportation_complement'