Merge "Don't ack/nak backup redundantly at exit"