Merge branch 'ja/doc-placeholders-markup-rules' into HEAD