Cherry-pick: Merge branch 'az/indexer-parse-fix' into 'release/0.28'

Lauren Datzrequested to merge
cherry-pick-for-888 into release/0.28

(cherry picked from MR !888 (merged))

Edited by Marc Burnie [AWS]

Merge request reports