Fix graph display compilation bugs
Merge branch 'graph-cleanup' into merge-from-standard
Merge branch 'merge-from-standard' into fix-loading-screen