Added changes to index generators.
Merge remote-tracking branch 'origin/master'