Merge branch 'ah/doc-interpret-trailers-ifexists' into maint