Merge pull request #18252 from hrwX/indi-fix

fix(Issue): resolution by indicator