Fix graphical glitches in charts due to stale data
Merge remote-tracking branch 'origin/pr/322'