Merge pull request #18419 from TolyaTalamanov:at/generic-inference