bugfix: wrong scopes
Merge branch 'origin/piechart_experimental'