Merge commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1' * commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1': Fix the metadata-available test during restore
Merge commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1' * commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1': Fix the metadata-available test during restore