Merge "fixed for Visual Studio 2017" into tizen