Merge branch 'tq/branch-style-fix' into maint