Merge branch 'jt/stash-tests' into next