Merge "Fix partial-read handling during restore"