Merge branch 'fix-drawingdoc'