Merge branch 'newapi' into next