Adam/merge jsdraw hotfix to master

Hotfix branch with master merged into it so that we can be sure that it passes tests