Added fix for graph refresh disappearing.
Merge branch 'refs/heads/development'