Merge branch 'jk/maint-tag-show-fixes' into maint