Merge branch 'rs/no-mode-to-open-when-appending' into maint