Merge pull request #1985 from suryanarayanakb/dev-branch

Graph widget and the colors changed
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch