Merge branch 'drawing-api-prose'