Merge "Fix build issues for windows platform" into devel/master