Merge change 24117 into eclair

* changes:
  Replace the delimiter whitespace with '\0'.