Merge pull request #24463 from sandreenko/ExcludeMethodImpl