Merge branch 'jt/use-trailer-api-in-commands'