Merge commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3' * commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3': Add file mode to the file-backup saved state blobs