Merge "BUG-509: StoreUtils should operate on NormalizedNode"