Cherry-pick of PR 8606 missed the v1.7.2 milestone Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>