Merge "Making delete_on_termination configurable"