onnxruntime

Fix a couple of subgraph related edges cases

#4004

Merged