Merge branch 'jk/tap-verbose-fix' into maint