Merge branch 'rl/maint-stash-i18n-save-error' into maint