Adding changes from branch hotfix-indexing0.6.5

Adds changes from the indexing hotfix branch to this branch download
.sh script.