Merge pull request #15240 from demeritcowboy/avoid-variable-name-conflict