Merge "BUG-1848 : OrderedNormalizedNodeWriter implementation"