Merge branch 'f-chart-picker-in-gl'