(cherry picked from commit be56ff28)

Co-authored-by: Iwaki Shinichiro <shinichiro-iwaki@primo.mamezou.com>