Merge "Fix hang after end of backup"