Fix indicators
Merge branch 'indicators' into staging