Issue #28678: Merge parameter name from 3.6