First batch of work on jenkins-slave