Merge branch 'Charting_Support'