#17592 follow_up