resolve namescape conflict
Merge branch 'hostname-support' into ijin