Merge branch 'planet_charts'