Migrate changes from #885 and #884 into master
Migrate changes from #885 and #884 into master

scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos