Merge branch 'sg/doc-pretty-formats' into maint