Merge remote-tracking branch 'github/devel' into devel
Merge branch 'master' into devel
fix of a reference to host id