Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint