(cherry picked from commit 030345c0 ) Co-authored-by: Takuya Akiba <469803+iwiwi@users.noreply.github.com>