GIRAPH-864
GIRAPH-825
GIRAPH-825