Merge branch 'gh/maint-stash-show-error-message' into maint