Fix build error by build environment
No enhancement.
Merge branch 'development'