if this is required, it should be in the bootstrap
Merge branch 'master' into feature/streamparse_runner