Merge branch 'indicator'