valentewx merge from ville

Change-Id: I6ded1a9efc61cd7738c1de1dc59a7751ee287148