restore (generic, polymorphic) index
Merge branch 'develop'

* develop:
  restore (generic, polymorphic) index