Olivier Massot 1d2f609cbb resolve conflicts after stash pop 3 éve
..
Layout 1d2f609cbb resolve conflicts after stash pop 3 éve
Ui 1c9e2b1f89 post MR fixes 3 éve