Merge branch 'x-new-api' into v0.2.0