refactor api
Merge remote-tracking branch 'origin/javelin' into javelin
fix compile