Merge with: IndexerAssigments_Issue491