[PATCH conductor 0/1] #791195 - destroy_on_provider cleanup