Bug 514634 General ImprovementChange-Id: Ia8b65e85a3a31e359acadd0b4a2d14531253e464 Signed-off-by:Arnault Lapitre <arnault.lapitre@cea.fr>