Applied latest changes from our rbprovisioner.