Merge branch 'hotfix/fix-admin-charts'
fixed number formatting + added test case
Merge branch 'hotfix/number-formatting' into develop