fix indicator import
Merge remote-tracking branch 'remotes/origin/fix-indicator-import'