Merge branch 'new-api' into new-api-bin