Merge bootstrap output fix
Merge (mainly) drawing server dev branch