Merge branch 'bc/doc-interpret-trailers-grammofix' into maint