Merge branch 'tk/interpret-trailers-in-place'