WIP: 4th revision according to Arnaud's comments

Change-Id: I9f20bbfd0e6ba4d7e0b467323a86dd52797a9f33