Merge branch 'jk/list-tag-2.7-regression' into maint