Merge branch 'hotfix/improved_index_charts_3'
Another one bite to dust...
Merge branch 'hotfix/improved_index_charts_4' into develop