Merge "Fix build error on windows platform" into devel/master