Merge branch 'jt/trailer-with-cruft'