Fixed loading from index
Merge remote-tracking branch 'origin/master' into test
Merge remote-tracking branch 'origin/master' into test
Merge remote-tracking branch 'origin/master' into test
Modified schema includes handling