Issue #26316: Merge Arg Clinic fix from 3.5