Merge remote-tracking branch 'origin/highcharter'

Change-Id: I98105c0315fc224838162774a6620d8e30263e68