Merge branch 'alexandre/inf7741'