hideo endo

#39887

@caps_rock