Merge branch 'jk/diff-rendered-docs'