Merge "Visual studio build fix using explicit cast"