Consolidation

Signed-off-by: yroffin <yroffin@ITEM-72766.dhcp.renn.fr.sopra>