Fixes to host entry handling
Merge branch 'master' into composite
Fixes to host entry handling