Merge the implementation of timechart and chart
#4755
Merged
Loading
timechart and chart
#4755