add Dimitri's feedback

Change-Id: I35a35d246d86b03921685f73a55098b6b1f419df