Added host ID.
Merge branch 'test' into dev