Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89' * commit 'e15df4017c3625de700e9f9953073f38898bbc89': If we can't get the restore set's metadata, don't continue
Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89' * commit 'e15df4017c3625de700e9f9953073f38898bbc89': If we can't get the restore set's metadata, don't continue