Merge branch 'st/verify-tag' into maint