Fixed error in hosted WL setup
Merge branch 'develop' into release/1.7

* develop:
  Fixed error in hosted WL setup