fix build issues
Merge branch 'develop'