Merge pull request #7142 from lioncash/shadow Common/MemoryPatches: Silence variable shadowing warnings
