Merge "BUG-2573: add NormalizedNode-based RPC API"