Merge branch 'jk/trailer-fixes'