divyenpatel: [cherry-pick 2.5] fall back to look up node by name (#1966)

No Results