Merged diff

Signed-off-by: Denis Roy <denis.roy@eclipse.org>