Merge "Bug 2327: Handle binary data in NormalizedNode streaming"