On top of master

Change-Id: Ib9e0c19d49da00d9f20c05951bf9fca44d32849b
Signed-off-by: Pascal Brand <pascal.brand@st.com>