Merge branch 'jk/interpret-trailers-outside-a-repository' into maint