Issue #21008: Fixed duplicate chart issue
Merge pull request #856 from lynnaloo/21008

Issue #21008: Fixed duplicate chart issue on refresh