Merge "Direct schema node lookup in SchemaUtils"