Merge branch 'develop' into lbudginas/#551_balance_chart_fix