Merge "Fix VCPKG CMake build issue." into devel/master