Merge branch 'jj/log-doc' into maint