fix linker issue
Merge branch 'develop'