Co-authored-by: Harunobu Daikoku <hdaikoku@yahoo-corp.jp> (cherry picked from commit ea6595d3b68ac462aec0d493718d7a10fbda0b6d)
Co-authored-by: Harunobu Daikoku <hdaikoku@yahoo-corp.jp> (cherry picked from commit ea6595d3b68ac462aec0d493718d7a10fbda0b6d)