Merge pull request #21390 from seamuslee001/function_type_hints_upgrade