* Companion for substrate#9878

Signed-off-by: koushiro <[email protected]>

* update substrate

Co-authored-by: thiolliere <[email protected]>