Merge branch 'nd/maint-autofix-tag-in-head'