Merge branch 'jk/stash-loosen-safety' into maint