Fix Issue 11425 - Broken shadowing variable diagnostic
Merge pull request #2793 from yebblies/issue11425

Issue 11425 - Broken shadowing variable diagnostic