Merge branch 'jk/tag-h-column-is-a-listing-option' into maint