Bug 514634 General Improvement Change-Id: I29b66087231283456faa4b702f9df1f8fccc0e59 Signed-off-by: Arnault Lapitre <arnault.lapitre@cea.fr>