Fixes for indicators
Merge branch 'master' into OAS-dev
quickfix
Merge branch 'master' into OAS-dev