Fix #1182#
Merge pull request #1190 from w-vi/quickstart-fix1182

Fix for issue #1182
add lang support for drafts (#826 & #1107)

Fix #826
Fix #1107