Merge branch 'rd/diff-options-typofix'