Merge branch 'ja/doc-style-fix'