Merge branch 'sg/doc-trace-appends' into maint