Merge "Optionally print name for fd"