compatible with old SDKs
Merge branch 'master' into beta