Graph-related js and css grouping
Merge remote-tracking branch 'upstream/hotfix/next' into hotfix/next