fix native fail
Merge branch 'normalize-adapter-api'