Merge "Remove hostname field as Hostname is preferred"