Fix #22940 Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Upstream-commit: 1670914b8a56ab8e6ead38739fddb416b61e444f Component: engine