Merge branch 'bc/use-asciidoctor-opt'