Merge branch 'merge_chart_link'