Merge branch 'jk/maint-stash-oob' into next