merge develop in ngv (remove graph var)