Merge branch 'sb/trailers-docfix'