reprise des commits :-)
Change-Id: I494a1ca7e0271b8d1a6487d39dea8097a95e4905