Fixes bug with duplicated index name

Closes-bug: #1308538
Change-Id: Ie5b4019ab0c2a1f95b75d33861c08730073c7fc2
Merge "Fixes bug with duplicated index name"