fix problem with the generation of the index name
Merge remote-tracking branch 'origin/develop' into develop
fix problem with the generation of the index name
Merge remote-tracking branch 'origin/develop' into develop