Merge branch 'rr/column-doc' into maint