Merge pull request #2779 from mjnaderi/develop

Use table name as a prefix for index names