Add missing track_idx_gid to CreateIndexes and DropIndexes
Merge branch 'master' into beta