Further fix for WL per host
Merge branch 'develop' into release/1.7

* develop:
  Further fix for WL per host