Related to oniro#752



Signed-off-by: sebastien.heurtematte <sebastien.heurtematte@eclipse-foundation.org>