Merge branch 'jk/asciidoc-update' into next