Merge develop in public
Merged with public (now V5)
Update graphs
Merge branch 'public' into develop