process Fabrice's feedback

Change-Id: Idc25368f0a50bd4246daaec445028854117d5ff6