cherry-pick
- must check line_chart again later (using old one)