Fix build error on build server
Merge branch 'develop'