Merge branch 'jk/stash-options' into maint