comment indicator generation
Merge branch 'master' into dashboard-module
add remaining indicators
merge with upstream