PR from master -> bosh-lite