GIRAPH-796
GIRAPH-442