doubleshot: recovery updates from upstream