Merge pull request #1611 from stefanth/Collection3/graph-rendering-speedup