Merge "Reuse nodes for case-insensitive lookups" into rvc-dev