Merge branch 'jk/doc-build-move-infordir-def'