Merge branch 'jk/trailer-fixes' into maint