Merge "Add output for host entries"