Pla 1318 indexer changes

Do not merge