Fixed a timing issue breaking charts.
Merge branch 'develop' into topic-groups