Merge branch 'jk/pending-keep-tag-name' into maint