Merge branch 'zj/mksh-columns-breakage'