Merge branch 'drawing-api'