Merge pull request #336 from eranpeer/otrempe-Fix-CollidingMockingCon… #226

Job	Run time
Windows 2025 MSVC 2022 Win32 C++14	2m 2s
Windows 2025 MSVC 2022 x64 C++14	1m 18s
Windows 2022 MSVC 2022 Win32 C++11 with cross-translation units mocks	1m 16s
Windows 2022 MSVC 2022 Win32	1m 32s
Windows 2025 MSVC 2022 Win32 C++11	1m 15s
Windows 2025 MSVC 2022 x64 C++20	1m 35s
Windows 2025 MSVC 2022 x64 C++23	2m 47s
Windows 2025 MSVC 2022 x64 C++11	1m 57s
Windows 2022 MSVC 2022 x64	1m 12s
Windows 2025 MSVC 2022 Win32 C++17	1m 47s
Windows 2025 MSVC 2022 Win32 C++23	1m 36s
Windows 2025 MSVC 2022 Win32 C++26	1m 41s
Windows 2025 MSVC 2022 x64 C++17	1m 17s
Windows 2025 MSVC 2022 x64 C++26 with cross-translation units mocks	1m 43s
Windows 2025 MSVC 2022 Win32 C++20	1m 33s
Windows 2025 MSVC 2022 x64 C++26	2m 4s
	26m 35s

Provide feedback