[DF-3607] Fixed MSVC solutions