Storing hostname as alias.
Merge branch 'test' into dev