Merge branch 'cc/interpret-trailers' into jch