Merge "Fix deadlock when full data backup times out" into nyc-dev