If the customer is not known, do not output the empty space
Merge remote-tracking branch 'stash/master'