Updated native API and merged into related files.