Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint