Merge branch 'vd/stash-silence-reset'