With comments from Joakim

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