Fixes
Merge branch 'new-api' into new-api-basic-tests