Adjust the index inclusion for the new index support.
6 files changed