Merge branch 'ja/fetch-doc' into maint