calc only visible indicators
Merge branch 'master' into production