Merge branch 'cc/trailers-corner-case-fix' into maint