Merge branch 'sg/column-nl' into maint