Merge branch 'ja/diff-opt-typofix'