Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f' * commit 'cac3126c6109854640266c4807e5aa8e6a87142f': Properly note the current active restore set's token
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f' * commit 'cac3126c6109854640266c4807e5aa8e6a87142f': Properly note the current active restore set's token