Merge "BUG-1091: sever the NormalizedNode/Node relationship"