Passing proper values for indexing on hosted
Merge branch 'develop' into release/1.7

* develop:
  Passing proper values for indexing on hosted