Fixed another issue with WL per host
Merge branch 'develop' into release/1.7

* develop:
  Fixed another issue with WL per host