Fabrice's feedback

Change-Id: I73fd5bd5ce9c0e2194c261d8fd36d7128a025945