aligned to latest SDK version (use api0.7 branch)