Merge branch 'cc/interpret-trailers-more'