Merge branch 'jj/log-doc'