Solve Windows&Linux build error
Merge pull request #1941 from gitchs/backporting

Solve Windows&Linux build error