Merge "Fix visual studio build issue"