Merge "Fix hostname issue"